u20024804

Tabs and Windows

Function	Shortcut
New Tab	`⌘` + `T`
Close Tab or Window	`⌘` + `W` (same as many mac apps)
Go to Tab	`⌘` + `Number Key` (ie: `⌘2` is 2nd tab)
Go to Split Pane by Direction	`⌘` + `Option` + `Arrow Key`
Cycle iTerm Windows	`⌘` + `backtick` (true of all mac apps and works with desktops/mission control)

Table Of Content

Skip to the relevant sections if needed.

2-min tutorial to do it the quick-and-dirty-way
Concepts for resolving Git conflicts
Setting up different editors / tool for using git mergetool
- Finding out what mergetool editors are supported
mergetool simple code example for vimdiff
- Resolving conflict from a Git pull
Other great references and tutorials

Resources

To install tcptraceroute on Debian/Ubuntu:

$ sudo apt-get install tcptraceroute

To install tcptraceroute on CentOS/REHL, first set up RepoForge on your system, and then:

$ sudo yum install tcptraceroute

To install unbound you can use homebrew

$ brew install unbound ldns

Now we can edit the configuration file of unbound which by default is located in /usr/local/etc/unbound/`unbound.conf`:

This is an example of using Linux Kernel's Transparent Proxy to route all TCP traffic to docker containers without having to resort to PROXY protocol which is not supported by some applications (e.g. sshd). To get the demo to work you only need vagrant installed:

git clone [this-gist] tproxy-demo
cd tproxy-demo
vagrant up

JDK 8 Released

Most of us won’t be able to use/deploy JDK 8 in production for a looong time. But that shouldn’t stop us from using it, right?

It should be possible to sneak in JDK 8 in the back way, the same way we snuck in Groovy and other libraries we wanted to use.

The Test Suite to the rescue

The Maven compiler plugin run in two separate lifecycles, compile and testCompile. Those can be configured separately.

	import struct
	import zipfile
	import time
	import os
	from binascii import crc32

	def commonprefix(m):
	"Given a list of pathnames, returns the longest common leading component"
	if not m: return ''
	s1 = min(m)

	#!/bin/bash

	# /usr/local/sbin/GeoIP_update
	#
	# Update geoip databases for xtables geoip module of iptables
	# Last updated: 20150513
	#

	XTABLESADDONS=/usr/lib/xtables-addons/
	XTABLEGEOIPDIR=/usr/share/xt_geoip/

	<?xml version="1.0" encoding="UTF-8"?>
	<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
	<plist version="1.0">
	<dict>
	<key>Label</key>
	<string>com.shadowsocks.chinadns</string>
	<key>ProgramArguments</key>
	<array>
	<string>/usr/local/bin/chinadns</string>
	<string>-l</string>