Merge remote-tracking branch 'upstream/master' into add-proxy-to-serv…

…er-ctx-filters
ikostov · Jul 17, 2015 · 50fcb06 · 50fcb06
2 parents cca5379 + 10b1bea
commit 50fcb06
Show file tree

Hide file tree

Showing 31 changed files with 2,084 additions and 570 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1 +1,11 @@
+sudo: false
+
 language: java
+jdk:
+  - openjdk6
+  - oraclejdk7
+  - oraclejdk8
+
+cache:
+    directories:
+    - $HOME/.m2