Merge branch 'master' into bgq_ramdisk_io
authorMatthew LeGendre <legendre1@llnl.gov>
Wed, 20 Feb 2013 17:53:02 +0000 (09:53 -0800)
committerMatthew LeGendre <legendre1@llnl.gov>
Wed, 20 Feb 2013 17:53:02 +0000 (09:53 -0800)
commit7cb1b9fc7cede466ef695f69bb0494731eb15b18
treee71b4fed3c4b43458b4cbf8614068693b144e50c
parent95e47d2fbfa4c93999b0f75f2a03722b70389315
parent0fb4f294ad5f7e2932a7db0433644e77e78d086e
Merge branch 'master' into bgq_ramdisk_io

Conflicts:
proccontrol/make.module.tmpl
proccontrol/src/linux.h
15 files changed:
proccontrol/h/PCProcess.h
proccontrol/make.module.tmpl
proccontrol/src/bluegeneq.C
proccontrol/src/bluegeneq.h
proccontrol/src/event.C
proccontrol/src/handler.C
proccontrol/src/int_event.h
proccontrol/src/int_process.h
proccontrol/src/int_thread_db.C
proccontrol/src/int_thread_db.h
proccontrol/src/irpc.C
proccontrol/src/linux.C
proccontrol/src/process.C
proccontrol/src/response.C
proccontrol/src/response.h