Merge remote-tracking branch 'origin/master' into UNOMI-28-ES-2-X-UPGRADE
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/ca1462d8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/ca1462d8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/ca1462d8 Branch: refs/heads/master Commit: ca1462d866b27cc41f3bb46c81865b2174748d26 Parents: a7fb48d b46a599 Author: Serge Huber <[email protected]> Authored: Wed Nov 16 11:25:11 2016 +0100 Committer: Serge Huber <[email protected]> Committed: Wed Nov 16 11:25:11 2016 +0100 ---------------------------------------------------------------------- BUILDING | 23 +++++++++++++++++++- .../actions/SetRemoteHostInfoAction.java | 3 ++- pom.xml | 20 +++++++++++++++++ .../geographic/sessionAdminSubDiv1.json | 8 +++++++ .../geographic/sessionAdminSubDiv2.json | 8 +++++++ 5 files changed, 60 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/ca1462d8/pom.xml ----------------------------------------------------------------------
