You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by on...@apache.org on 2014/09/12 17:08:18 UTC

[2/2] git commit: Merge remote-tracking branch 'origin/trunk' into origin-trunk

Merge remote-tracking branch 'origin/trunk' into origin-trunk


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2a7fb78e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2a7fb78e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2a7fb78e

Branch: refs/heads/trunk
Commit: 2a7fb78ec0e9e9a0e0220a474f2821bd997c98ad
Parents: 1b52db2 6aeb3be
Author: Oleg Nechiporenko <on...@apache.org>
Authored: Fri Sep 12 18:08:09 2014 +0300
Committer: Oleg Nechiporenko <on...@apache.org>
Committed: Fri Sep 12 18:08:09 2014 +0300

----------------------------------------------------------------------
 .../internal/ServiceConfigVersionResourceProvider.java   |  2 +-
 .../HDP/2.2/services/OOZIE/configuration/oozie-site.xml  | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------