GitHub user ottobackwards opened a pull request:
https://github.com/apache/metron/pull/725
METRON-1136 : Track Master
Track master for feature branch. This PR resolves conflicts in the rpm
spec and resource copy area of the pom.
- [x] Is there a JIRA ticket associated with this PR?
- [x] Does your PR title start with METRON-XXXX
- [x] Has your PR been rebased against the latest commit within the target
branch (typically master)?
- [x] Ran it in full dev
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/ottobackwards/metron ext-master-831
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/metron/pull/725.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #725
----
commit 8ee9eb8007ce3c0bbca553e8c4b5d861300d1a00
Author: Simon Elliston Ball <[email protected]>
Date: 2017-08-30T18:35:39Z
METRON-1139 Fixed service advisor profilerHost variable closes
apache/incubator-metron#722
commit cd14cbeefec6afc7aee9efcc288c9482d67d9657
Author: anandsubbu <[email protected]>
Date: 2017-08-31T12:14:12Z
METRON-1137 Build RPM for Metron MaaS as a part of rpm-docker packaging
(anandsubbu via nickwallen) closes apache/metron#719
commit b96bcec01c011c15f6fdf8b5995abb00c0ab4799
Author: Otto Fowler <[email protected]>
Date: 2017-08-31T13:32:08Z
Merge branch 'master' of https://github.com/apache/metron into
ext-master-831 and fix conflicts
in deployment
commit 1a4f19c86ed94742c08e8e264a7bb45ff9ad27a6
Author: nickwallen <[email protected]>
Date: 2017-08-31T14:10:53Z
METRON-1117 Filter Functions Returned by `%functions` (nickwallen) closes
apache/metron#704
commit af3516977c7596855effb1700fc103356f0bad53
Author: Otto Fowler <[email protected]>
Date: 2017-08-31T14:25:45Z
Merge branch 'master' of https://github.com/apache/metron into
ext-master-831
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
