[amplab-tachyon: 2/2] Merge branch 'f20'

[tstclair]

commit 393184cd2d124d90c2f577347a76b6ee0dddc9d4
Merge: e186605 0f96cea
Author: Timothy St. Clair <tstclair at redhat.com>
Date:   Wed Dec 18 16:05:43 2013 -0600

    Merge branch 'f20'
    
    Conflicts:
    	amplab-tachyon.spec
    	sources

 amplab-tachyon.spec    |   31 ++++++++++++++++++++-----------
 sources                |    2 +-
 tachyon-master.service |    4 ++--
 tachyon-slave.service  |    8 ++++----
 4 files changed, 27 insertions(+), 18 deletions(-)
---