Repository: apex-site Updated Branches: refs/heads/asf-site 3adbbd0d6 -> 645b5070b
from 63f2b535537284d2fa15a23450403206ccf06cd1 Project: http://git-wip-us.apache.org/repos/asf/apex-site/repo Commit: http://git-wip-us.apache.org/repos/asf/apex-site/commit/645b5070 Tree: http://git-wip-us.apache.org/repos/asf/apex-site/tree/645b5070 Diff: http://git-wip-us.apache.org/repos/asf/apex-site/diff/645b5070 Branch: refs/heads/asf-site Commit: 645b5070b0d1c600ea591d0d87b4abcd4ec4908c Parents: 3adbbd0 Author: Thomas Weise <[email protected]> Authored: Mon Oct 10 11:44:32 2016 -0700 Committer: Thomas Weise <[email protected]> Committed: Mon Oct 10 11:44:32 2016 -0700 ---------------------------------------------------------------------- content/contributing.html | 6 ++++-- content/powered-by-apex.html | 10 +++++----- 2 files changed, 9 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/apex-site/blob/645b5070/content/contributing.html ---------------------------------------------------------------------- diff --git a/content/contributing.html b/content/contributing.html index f1321d6..1efcd02 100644 --- a/content/contributing.html +++ b/content/contributing.html @@ -150,7 +150,8 @@ Creating a local branch that tracks a remote makes pull easier (no need to speci <li>Run <code>mvn license:format -Dlicense.skip=false</code> to automatically add the header when missing.</li> </ul> </li> -<li>Once your feature is complete, submit the pull request on github against <code>master</code>. Use the JIRA number (e.g. APEXCORE-123) as prefix in the pull request title. This will ensure the information is attached to the JIRA ticket automatically.</li> +<li>Once your feature is complete, submit the pull request on github against <code>master</code>. <strong>Use the JIRA number (e.g. APEXCORE-123) as prefix in the pull request title</strong>. This will ensure the information is attached to the JIRA ticket automatically. If commits result from running scripts, file formatting or similar, use following attribution:<br/> +<code>git commit --amend --author "Apex Dev <[email protected]>"</code></li> <li>If you want specific people to review your pull request, use the <code>@</code> notation in Github comments to mention that user, and request that he/she reviews your changes.</li> <li>Check the status of the pull request and ensure the Travis CI build is successful. If not, inspect the linked build log for details.<ul> <li>If build fails due to license headers, follow instructions above.</li> @@ -202,11 +203,12 @@ squash 6f98905 change2 <li>Travis CI pull request build needs to pass</li> <li>Ensure tests are added/modified for new features or fixes</li> <li>Ensure appropriate JavaDoc comments have been added</li> +<li>Nice to have: Ensure the PR is rebased to apache/master to avoid extra merge commits (especially if the contributor is right next to you).</li> </ul> </li> <li>To set up access to the ASF source repository, <a href="https://git-wip-us.apache.org/#committers-getting-started";>follow these steps</a>. The ASF master repository is:<br/> <code>https://git-wip-us.apache.org/repos/asf/apex-core.git</code></li> -<li>Use the git command line to pull in the changes from the pull requests. You can refer to the corresponding email that will be automatically sent to the <code>[email protected]</code> mailing list to see the exact commands to merge the given pull request.</li> +<li>Use the git command line to pull in the changes from the pull requests. You can refer to opened PR notification that was automatically sent to the <code>[email protected]</code> mailing list to see the exact merge commands.</li> <li>Once done with verification, push the changes to the ASF repository's <code>master</code> branch. Within a few seconds, the changes will propagate back to the github mirror and the pull requests be closed and marked merged automatically.</li> <li>The <code>Fix version</code> field on the corresponding JIRA ticket needs to be set and the ticket resolved after pushing the changes.</li> http://git-wip-us.apache.org/repos/asf/apex-site/blob/645b5070/content/powered-by-apex.html ---------------------------------------------------------------------- diff --git a/content/powered-by-apex.html b/content/powered-by-apex.html index ba01f78..7008c9a 100644 --- a/content/powered-by-apex.html +++ b/content/powered-by-apex.html @@ -95,10 +95,10 @@ <h2 id="companies">Companies</h2> <p>Apex powers</p> <ul> -<li>GE</li> -<li>Capital One</li> -<li>Silver Spring Networks</li> -<li>PubMatic</li> +<li>GE - use case presentation <a href="http://www.slideshare.net/ApacheApex/ge-iot-predix-time-series-data-ingestion-service-using-apache-apex-hadoop";>slides</a> and <a href="https://www.youtube.com/watch?v=hmaSkXhHNu0";>video</a> </li> +<li>Capital One - use case presentation <a href="http://www.slideshare.net/ApacheApex/capital-ones-next-generation-decision-in-less-than-2-ms";>slides</a> and <a href="https://www.youtube.com/watch?v=98EW5NGM3u0";>video</a> </li> +<li>Silver Spring Networks - use case presentation <a href="http://www.slideshare.net/ApacheApex/iot-big-data-ingestion-and-processing-in-hadoop-by-silver-spring-networks";>slides</a> and <a href="https://www.youtube.com/watch?v=8VORISKeSjI";>video</a></li> +<li>PubMatic - use case presentation <a href="https://www.youtube.com/watch?v=JSXpgfQFcU8";>video</a></li> <li>ThreatMetrix</li> <li>FacilitiesSupplies</li> <li>DataTorrent</li> @@ -112,7 +112,7 @@ <li>LeadFerret</li> <li>Target</li> </ul> -<h2 id="software-integrations">Software Integrations</h2> +<h2 id="integrations">Integrations</h2> <p>Apex integrates with</p> <ul> <li>Apache Beam</li>
