Restructure this document to line up with workflow.
Merge remote-tracking branch 'upstream/master' into docfix4
Update with line wrapping log reading.
Update push with get branch name.
Note about pull request msg, better pull request
Describe  git push to feature branch after pullreq
Update hdfs makefile to use .c instead of .cc suffix.

From @mppf:

I was getting build problems that 'make clobber' solved for me. I believe the
patch below addresses the issue, since the HDFS support files are now C.
Fix hwloc build for pgcc

pgcc does not support the -static flag. They have their own version, -Bstatic.
This isn't a problem for PrgEnv-pgi since the PrgEnv wrapper translates -static
to the appropriate command.

See 2f9e3f73cf0afebd2b20870586569fc71c76d02e for more info. Note that we didn't
used to just test pgcc without the wrappers but I believe we do now to try to
test for users who just use the pgi compiler not on a cray.
Local update of STATUS.devel, removing futures recently retired by me.
Merge pull request #228 from ronawho/fix-hwloc-build-for-pgcc

Fix hwloc build for pgcc

pgcc does not support the -static flag. They have their own version, -Bstatic.
This isn't a problem for PrgEnv-pgi since the PrgEnv wrapper translates -static
to the appropriate command.

See 2f9e3f7 for more info. Note that we didn't
used to just test pgcc without the wrappers but I believe we do now to try to
test for users who just use the pgi compiler not on a cray.
Fix config_param.future: Internal error in getVisibilityScope().

This test failed because a type definition inside a param "if" block is not actually in
the AST.  But an attempt is made to resolve the type constructor anyway in
resolveAutoCopies().

The cure is to weed out this undesirable case.

The .good file had to be updated ("false" is expected).

The .future file was removed, as the test now passes.
Update test scripts since qthreads became the default

Previously we explicitly tested qthreads in a couple of configurations. Since
qthreads is the default we now want to switch those machines to test fifo.

Also valgrind will use fifo for the time being (and maybe permanently.) We
don't have valgrind suppressions for qthreads.
New .bad files to fix 4 regressions
Merge pull request #231 from ronawho/fix-testing-scripts-since-qthreads

Update test scripts since qthreads became the default

Previously we explicitly tested qthreads in a couple of configurations. Since
qthreads is the default we now want to switch those machines to test fifo.

Also valgrind will use fifo for the time being (and maybe permanently.) We
don't have valgrind suppressions for qthreads.
Merge pull request #232 from noakesmichael/master

New .bad files to fix 4 regressions

Two new regressions were caused by changes to Chapel libraries that altered line numbers.
The other two new regressions were caused by the bump from version 1.9 to 1.10 that are exposed in the error message

Trivial and no review
Remove assertion (syncs behave like records, but aren't).
Merge branch 'master' into fixConfigParamFuture

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Stop the spam messages about svn perf updates and commits

Svn updates and commits have been broken for a while, but are on the list of
things to be fixed / converted to git. The messages are just spam now, and are
cluttering up mailboxes and the mailing list archives.
Merge pull request #234 from ronawho/turn-off-svn-failure-mails

Stop the spam messages about svn perf updates and commits

[ok'd on chat]

Svn updates and commits have been broken for a while, but are on the list of
things to be fixed / converted to git. The messages are just spam now, and are
cluttering up mailboxes and the mailing list archives.
Suggested fixes from Thomas, rewrap some paragraph