trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sure...@apache.org
Subject [3/3] incubator-trafodion git commit: Merge remote branch 'origin/pr/122/head' into mrg_62
Date Wed, 14 Oct 2015 20:28:31 GMT
Merge remote branch 'origin/pr/122/head' into mrg_62


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/7bb805d4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/7bb805d4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/7bb805d4

Branch: refs/heads/master
Commit: 7bb805d48a38497e1bf94bfc5daf4c25ca5e66eb
Parents: 64c5f79 9d033a1
Author: Suresh Subbiah <sureshs@apache.org>
Authored: Wed Oct 14 20:26:53 2015 +0000
Committer: Suresh Subbiah <sureshs@apache.org>
Committed: Wed Oct 14 20:26:53 2015 +0000

----------------------------------------------------------------------
 Makefile                                        |  4 +
 core/Makefile                                   |  6 +-
 .../org/trafodion/rest/VersionAnnotation.java   |  4 +-
 .../org/trafodion/rest/version/util/VerGen.java |  2 +-
 core/sqf/sql/scripts/install_local_hadoop       | 50 +------------
 core/sqf/sql/scripts/install_traf_components    | 79 ++++++++++++++++++--
 dcs/bin/stop-dcs.sh                             |  3 +
 dcs/conf/log4j.properties                       |  2 +-
 .../org/trafodion/dcs/VersionAnnotation.java    |  4 +-
 .../org/trafodion/dcs/version/util/VerGen.java  |  2 +-
 .../resources/dcs-webapps/master/servers.jsp    |  4 +-
 dcs/src/saveVersion.sh                          |  2 +-
 wms/bin/scripts/hp_default_service.py           | 66 ----------------
 wms/bin/scripts/traf_default_service.py         | 66 ++++++++++++++++
 14 files changed, 162 insertions(+), 132 deletions(-)
----------------------------------------------------------------------



Mime
View raw message