Merge remote-tracking branch 'origin/master'

# Conflicts: # gui/admin-gui/src/main/resources/localization/Midpoint.properties
Evolveum · May 5, 2016 · 6c9c4fb · 6c9c4fb
2 parents 7a6c76a + c599b90
commit 6c9c4fb
Show file tree

Hide file tree

Showing 71 changed files with 2,258 additions and 907 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,6 +5,10 @@ language: java
 #skips default install - see script bellow
 install: true
 
+cache:
+  directories:
+    - $HOME/.m2
+
 # custom script is used so build and tests are done in one mvn command, separating it (as Travis does by default) leads to problem with ConnId (notably DummyResource)
 # travis_wait is used for integration tests workround as default Travis settings kills build if no message is printed to stdout for 10 mins
 #script: travis_wait 120 mvn clean install