Steve Harris
072065191b
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/skewt/bkgd/NsharpSkewTBackground.java
Former-commit-id: 4c4c79036c
[formerly 36261cb095
] [formerly 753a5213ab
] [formerly 4c4c79036c
[formerly 36261cb095
] [formerly 753a5213ab
] [formerly 0cd7e56e65
[formerly 753a5213ab
[formerly 7b68942012eaf060f364f1e474b2b93379e1b3d6]]]]
Former-commit-id: 0cd7e56e65
Former-commit-id: 47cde9bd09
[formerly bca46a1354
] [formerly 2726614c378a7a21453ace53443d019d65cea76e [formerly d5bcdb0015
]]
Former-commit-id: afba0e5b2a5a76c08ffa616eefd96f2ca6363113 [formerly 5232592cfa
]
Former-commit-id: 346b22b196
2013-03-12 16:04:23 -05:00
Dave Hladky
87992329b4
Issue #1782 Merge branch 'master_13.3.1' into omaha_13.3.1
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
ncep/com.raytheon.uf.edex.ncep.feature/feature.xml
Change-Id: I02fce82c45560fb3f150864eb56e4a6f264f3227
Former-commit-id: e17f8e0511
[formerly 5c65862b8f
] [formerly a1006667e0
] [formerly e17f8e0511
[formerly 5c65862b8f
] [formerly a1006667e0
] [formerly 4b08491880
[formerly a1006667e0
[formerly 71a04da8f5aa339146bb45cce71c7b295735f43f]]]]
Former-commit-id: 4b08491880
Former-commit-id: eefd544e4b
[formerly 155903d135
] [formerly ad56918be504d78eeaaedaf28f186a5531e74b1f [formerly 6ea95002de
]]
Former-commit-id: 70f3f744097c668c89b07b6780fc8db6c04380d8 [formerly 29ed641a13
]
Former-commit-id: cdfbcc7136
2013-03-12 15:48:34 -05:00
Steve Harris
ed1788343e
13.3.1-6 baseline
...
Former-commit-id: 4eef6862d6
[formerly 2e110bd151
] [formerly 3a4c7931e1
] [formerly 4eef6862d6
[formerly 2e110bd151
] [formerly 3a4c7931e1
] [formerly 566b677d09
[formerly 3a4c7931e1
[formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]]]]
Former-commit-id: 566b677d09
Former-commit-id: 0cec06c171
[formerly 6fe4b16924
] [formerly d7e03fcb3e7009a23e58cf48707fadfffebfe3d0 [formerly 4ed21b702b
]]
Former-commit-id: 0e585016165e18d475399f775c1938136de541c6 [formerly c6f379f59a
]
Former-commit-id: c28f3aeb02
2013-03-12 08:35:45 -05:00
Steve Harris
b64731872c
Merge branch 'omaha_13.3.1' into development
...
Former-commit-id: afd934db35
[formerly 6b13492420
] [formerly d5b80f9225
] [formerly afd934db35
[formerly 6b13492420
] [formerly d5b80f9225
] [formerly aa0e9acefd
[formerly d5b80f9225
[formerly dd9a3152106c5e4eac6fb2de10f27528e5177810]]]]
Former-commit-id: aa0e9acefd
Former-commit-id: 1709c34b8f
[formerly 4a0b8772ec
] [formerly 6d472393251484c670223cabe82285a18503dc7c [formerly b9563da8a8
]]
Former-commit-id: ad6ef96c444820a88fa41f79cf60d91bc2c26386 [formerly 46d0c9fcee
]
Former-commit-id: 2b489e4e40
2013-03-05 12:29:44 -06:00
Steve Harris
2104c8b533
Merge branch 'master_13.3.1' (13.3.1-5) into omaha_13.3.1
...
Former-commit-id: 3ec20c1689
[formerly 61a19a460b
] [formerly 305dd72969
] [formerly 3ec20c1689
[formerly 61a19a460b
] [formerly 305dd72969
] [formerly 57f42761d7
[formerly 305dd72969
[formerly 2e491cb6e37e984fb25c4bb4006e3b7a24b4109c]]]]
Former-commit-id: 57f42761d7
Former-commit-id: 7ff64bf8cc
[formerly b423579e4a
] [formerly 3ba12429d361c6540fa79a3a73c1e6b40b39ba2c [formerly a8e1557c62
]]
Former-commit-id: 276acc0cf2f69b884f078f338890570213eec929 [formerly b630339eb7
]
Former-commit-id: d842ed88a7
2013-03-05 12:27:49 -06:00
Steve Harris
f20c87110e
13.3.1-5 baseline
...
Former-commit-id: e4a1c61ad5
[formerly 8123d5ac45
] [formerly a89221c75b
] [formerly e4a1c61ad5
[formerly 8123d5ac45
] [formerly a89221c75b
] [formerly e26f7eb151
[formerly a89221c75b
[formerly 97fafc60d9327ab3ea3f72266113c8f5e122a275]]]]
Former-commit-id: e26f7eb151
Former-commit-id: aabd5cd51f
[formerly a240379588
] [formerly 96eeb29b073d8e7bf413ace53284a7d3f9fd8170 [formerly a40c9136fe
]]
Former-commit-id: 8b4bd6790f2136380dbac557b452d873c77bacc6 [formerly 1f98e01c57
]
Former-commit-id: 79ff805090
2013-03-05 10:47:06 -06:00
Steve Harris
52aae101cc
13.3.1-4 baseline
...
Former-commit-id: 9066d511fe
[formerly d79303de13
] [formerly 8c0b90f292
] [formerly 9066d511fe
[formerly d79303de13
] [formerly 8c0b90f292
] [formerly 2edca90902
[formerly 8c0b90f292
[formerly 572c500b0c67d72405bdf533c43c68b1955ae90e]]]]
Former-commit-id: 2edca90902
Former-commit-id: 4bfbb518c0
[formerly 3e0614b43a
] [formerly c3fe7088594b70139dad19673128f3fd665d1be1 [formerly 5e55ded3a9
]]
Former-commit-id: e4eaa93661df211ab065d6c9dd5f042f5011f151 [formerly 0df35cc5ec
]
Former-commit-id: 153aadc1d7
2013-03-05 10:39:59 -06:00
Bryan Kowal
ebec988cac
Issue #1750 - edexBridge will now set the QPID persistence flag
...
Change-Id: I84132466da523b7ce193cdd38adef85c76828a98
Former-commit-id: b407a34461
[formerly d484acbca0
] [formerly 3a8efd5edf
] [formerly b407a34461
[formerly d484acbca0
] [formerly 3a8efd5edf
] [formerly 8b4dce1c3d
[formerly 3a8efd5edf
[formerly d466b647d0d810418a88c875f39e55d98d680aa1]]]]
Former-commit-id: 8b4dce1c3d
Former-commit-id: 553f988935
[formerly 0d9400b2ec
] [formerly 7570c6107ddb950a2b736fd6b01c90c29e178ab4 [formerly eba8ccc6cd
]]
Former-commit-id: 38209d670d15d376adafb37ba781ff002f8b28b6 [formerly 4204310294
]
Former-commit-id: 80cb164e61
2013-03-04 17:58:04 -06:00
Bryan Kowal
e23e2eeec2
Issue #1739 - fix Wes2Bridge
...
Change-Id: Idf557cb11d9a3314021536e9537afaf33a589814
Former-commit-id: 18a778cb8c
[formerly 9022c53d53
] [formerly 20d3c6bcaa
] [formerly 18a778cb8c
[formerly 9022c53d53
] [formerly 20d3c6bcaa
] [formerly 86a1f16e37
[formerly 20d3c6bcaa
[formerly b74410b2e816686ed9525e3e8a80c17096e6aadb]]]]
Former-commit-id: 86a1f16e37
Former-commit-id: 0a93a4a25c
[formerly 5958c0a876
] [formerly 12218fd7f3fba3ae75003e4e79567e4ffd54c4d1 [formerly ed6e1003ff
]]
Former-commit-id: 41c069f5b278b4893f615956f01f3a05822496ce [formerly 0e2cad14b2
]
Former-commit-id: d0eb95dbbe
2013-03-01 11:49:09 -06:00
Bryan Kowal
cfaaafbd5a
Issue #1739 - updates for recent CAVE and EDEX feature-refactoring
...
- resolved EDEX rpm naming conflict
- resolved CAVE junit dependency issue
Change-Id: I8d868188ad8eff5f55ec9894477f1f772fa4d2dc
Former-commit-id: 875c17399a
[formerly f806c880d3
] [formerly d081a2afcd
] [formerly 875c17399a
[formerly f806c880d3
] [formerly d081a2afcd
] [formerly 4faf8aefbe
[formerly d081a2afcd
[formerly 7028a07133a943fe15b094bbd439cbd885463b2e]]]]
Former-commit-id: 4faf8aefbe
Former-commit-id: e005f18132
[formerly c4709b1bfb
] [formerly 7cd233f6e540666556c9d7a93a89b4d6dfd51ec6 [formerly 497bf33892
]]
Former-commit-id: a05976388b8f7d2005143e0d29a6962ef9b7b34e [formerly cb5a2677b9
]
Former-commit-id: 4d50fec21f
2013-02-28 18:09:25 -06:00
Bryan Kowal
b8abcf8692
Issue #1638 - update CAVE rpm name generation
...
Change-Id: Ia574741cfbe5765875924c27848d41ff7b82379f
Former-commit-id: 37e9c0cb20
[formerly a9123a2b84
] [formerly b8496877ff
] [formerly 37e9c0cb20
[formerly a9123a2b84
] [formerly b8496877ff
] [formerly 5eb888fb98
[formerly b8496877ff
[formerly 7cf0100415245ae81fa232e398936fe33a2b1bc3]]]]
Former-commit-id: 5eb888fb98
Former-commit-id: 6f57b06d52
[formerly da0d99d22f
] [formerly 16e35fbbb02090042f28676c5c7015864604ab11 [formerly 22acca8f3d
]]
Former-commit-id: 8a05919b3352b9c20cdce27168ba0ceb43d51c4c [formerly 3c2210c80d
]
Former-commit-id: bc668bc828
2013-02-28 14:43:53 -06:00
Richard Peter
0a5fc08b3e
Merge "Issue #1576 - all of the qpid broker-plugins will now be built and included in the qpid broker rpm" into development
...
Former-commit-id: bcd6b4d82b
[formerly b354ebb862
] [formerly 6c766ddd85
] [formerly bcd6b4d82b
[formerly b354ebb862
] [formerly 6c766ddd85
] [formerly 84e1b2f999
[formerly 6c766ddd85
[formerly d89e15dc9528bfbc67f67cc1d8a2989e7390131d]]]]
Former-commit-id: 84e1b2f999
Former-commit-id: f3528bedea
[formerly 0f1c3dd256
] [formerly 1d88c5c600f75ba32fbd740729eacc1432ef74f4 [formerly 9fa37933e6
]]
Former-commit-id: aba90ab67ec4f2013fcb3a9461b728e2addec1ff [formerly eff7670694
]
Former-commit-id: 4b22cf71f4
2013-02-27 11:43:18 -06:00
Steve Harris
9d9a17aa64
Merge branch 'development' into omaha_13.3.1
...
Former-commit-id: 90b0bab156
[formerly 0a4564eb97
] [formerly 67f090638f
] [formerly 90b0bab156
[formerly 0a4564eb97
] [formerly 67f090638f
] [formerly 6ec9e73035
[formerly 67f090638f
[formerly 52683c1ffba08b80b0d1f2b619161e108ca598b8]]]]
Former-commit-id: 6ec9e73035
Former-commit-id: f30d1cdf87
[formerly e46625f8f2
] [formerly bd72fedeff4f0ceca04ec0a96bb50b7706e7a460 [formerly 0051276ad1
]]
Former-commit-id: 8958c8255ceab6eb6c8e58c5cb4c8a688e5de950 [formerly 140ae3191c
]
Former-commit-id: 9db68d0585
2013-02-25 15:58:48 -06:00
Bryan Kowal
18b7aaed49
Issue #1634 - force added wrapper jars in bin directory
...
Change-Id: If9bee93b5893fb8ecc244045fa0672d3f5b92f48
Former-commit-id: 6f419ae22f
[formerly 4cd5453e0a
] [formerly 7c62991edf
] [formerly 6f419ae22f
[formerly 4cd5453e0a
] [formerly 7c62991edf
] [formerly d5c8b82941
[formerly 7c62991edf
[formerly 4f07f09e39949f6323dac4688913e02672a17fd8]]]]
Former-commit-id: d5c8b82941
Former-commit-id: ec53fa98cd
[formerly 53b9e69868
] [formerly e7559e2861931ac623033c77973bf5ebff63f7c9 [formerly 5a5914c010
]]
Former-commit-id: e900cecc385d0b35cf2613204f84c8aac131bc81 [formerly fd17273cb2
]
Former-commit-id: dd7eda15aa
2013-02-22 09:28:37 -06:00
Steve Harris
34d0f59592
Merge branch 'development' into omaha_13.3.1
...
Conflicts:
cave/com.raytheon.uf.viz.core.maps/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesconfigAction.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ProductTableComp.java
Former-commit-id: abdc733151
[formerly 64744fdb19
] [formerly a0573644c4
] [formerly abdc733151
[formerly 64744fdb19
] [formerly a0573644c4
] [formerly 2641d578e2
[formerly a0573644c4
[formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]]]
Former-commit-id: 2641d578e2
Former-commit-id: 7e48d3e684
[formerly 4f155a183a
] [formerly 4a25bf4d6d77c9356aa1e74660e835a98a31e78b [formerly 33dd2589f1
]]
Former-commit-id: 52ef36f1490e95f8582d69438eed38f21061eafb [formerly f3c3191a1c
]
Former-commit-id: b5d9e75b95
2013-02-21 15:41:39 -06:00
Bryan Kowal
55b55a1255
Issue #1634 - replaced tanuki java service wrapper with yet another java service wrapper
...
- disabled the startup of the admin web application in the jetty container
- removed configuration and libraries specific to the tanuki java service wrapper
- updated the rpm build and developer deployment
- added jetty-util-6.1.26.jar to resolve a dependency on org.mortbay.log...
Former-commit-id: 0d4a63efe4
[formerly 519ce2c0fb
] [formerly a8fb04f41c
] [formerly 0d4a63efe4
[formerly 519ce2c0fb
] [formerly a8fb04f41c
] [formerly 803397c7c7
[formerly a8fb04f41c
[formerly a5d554c271b87fa6d6b264ebb677802b58ebb763]]]]
Former-commit-id: 803397c7c7
Former-commit-id: 6a47017449
[formerly b2a0a7c148
] [formerly 6195241ffacf1c8bdcb22aae44f96bfee0eedf78 [formerly 450e8e7a4c
]]
Former-commit-id: 302b1a5ae96498f9e93f50ccd303b89ce6085fa5 [formerly 2a21f2624b
]
Former-commit-id: b88a24574b
2013-02-21 13:55:28 -06:00
Steve Harris
fac2d20002
13.3.1-1 baseline
...
Former-commit-id: e0406d3183
[formerly 8ae397085e
] [formerly 71e8990021
] [formerly e0406d3183
[formerly 8ae397085e
] [formerly 71e8990021
] [formerly d2a654625f
[formerly 71e8990021
[formerly 34684c71436ce4c395ea523eb34ded6792476816]]]]
Former-commit-id: d2a654625f
Former-commit-id: db712e1fcf
[formerly e4435815c9
] [formerly 42269f8019656ea35c9d11244f51d5ae9ac18ac0 [formerly 46d28be4a4
]]
Former-commit-id: 30806b31de967d82824f245a2f6cb89f081cfd19 [formerly b3b56830b0
]
Former-commit-id: 8c828dbd75
2013-02-20 16:19:40 -06:00
Steve Harris
b7446ac966
Merge branch 'omaha_13.2.1' (13.2.1-8) into development
...
Former-commit-id: f1f5359a2f
[formerly c2327ce33d
] [formerly ea50a5db77
] [formerly f1f5359a2f
[formerly c2327ce33d
] [formerly ea50a5db77
] [formerly d123c044c3
[formerly ea50a5db77
[formerly 819f88fb8b26ec0a83164df82b31e9b824b49da8]]]]
Former-commit-id: d123c044c3
Former-commit-id: bca88ba9c7
[formerly 81f1fb83a0
] [formerly d8887e78bdc5e20d85019ee8b30e177eceb18ccf [formerly 1c08acab38
]]
Former-commit-id: cb9ccc383baf32e35d0325fdfa001bdd7a62b969 [formerly 5a33182da5
]
Former-commit-id: 77a66598fe
2013-02-19 12:22:00 -06:00
Steve Harris
7cc8f5879d
Merge "Issue #1632 - new FOSS licenses added for Data Delivery plugins" into omaha_13.2.1
...
Former-commit-id: fcef63a7af
[formerly b8720e185d
] [formerly 1874b07ab4
] [formerly fcef63a7af
[formerly b8720e185d
] [formerly 1874b07ab4
] [formerly 6318348e3b
[formerly 1874b07ab4
[formerly c397745e9c36a88bf71d87b671f0a8c826e117ea]]]]
Former-commit-id: 6318348e3b
Former-commit-id: 435be40166
[formerly 85fa1539ef
] [formerly b6bfbd19eba2539cd1cfc863faeaf188664f3a8f [formerly 4777c782e2
]]
Former-commit-id: 66fc4af51586eb362c988e619a639fb8058c19f2 [formerly 71edff51e2
]
Former-commit-id: e4a430b3a9
2013-02-18 09:52:22 -06:00
Steve Harris
def834c9a2
Issue #1632 - new FOSS licenses added for Data Delivery plugins
...
Former-commit-id: 0e7cd27efc
[formerly 049c219f2b
] [formerly 02ec634536
] [formerly 0e7cd27efc
[formerly 049c219f2b
] [formerly 02ec634536
] [formerly b9ce5b8b35
[formerly 02ec634536
[formerly 82d2a8bdfe9a82cce28637153c8cbb169bd1aa5a]]]]
Former-commit-id: b9ce5b8b35
Former-commit-id: 6c16384c5c
[formerly 7a9501de55
] [formerly 93562620757b43bfd2d1bd9159c4db359d64f1ad [formerly 3c3681420e
]]
Former-commit-id: 1f44d6f4998a2d1af45e7b51fcd2cd356a71ab38 [formerly daba9ecc43
]
Former-commit-id: a488f3d978
2013-02-18 09:39:31 -06:00
Steve Harris
0b53108cbe
13.2.1-8 baseline
...
Former-commit-id: d176ec1f38
[formerly 18da2e93d7
] [formerly f81b382c04
] [formerly d176ec1f38
[formerly 18da2e93d7
] [formerly f81b382c04
] [formerly 053156f02e
[formerly f81b382c04
[formerly f64f1b68b75f4903ab4bb7f7d60bbe4f1f59c669]]]]
Former-commit-id: 053156f02e
Former-commit-id: db02d32440
[formerly 8cffb55371
] [formerly 609380ceb2a4b7bcee69d80b0285d0756125ad49 [formerly c6d584758f
]]
Former-commit-id: db6d42ff3ca25509616d69de95cc4fe49742d3a6 [formerly edac913af7
]
Former-commit-id: 32ad300b47
2013-02-18 09:09:41 -06:00
Bryan Kowal
e85d781dfc
Issue #1576 - all of the qpid broker-plugins will now be built and included in the qpid broker rpm
...
- the baselined AWIPS II Jetty was incompatible with qpid; so, the expected version of jetty will be used
- source jars will no longer be included in the rpms
Change-Id: I8172800bfbc31be7117c490e828ebfc1e2355774
Former-commit-id: 815ad5b07d
[formerly 306842b297
] [formerly 612d4fca1f
] [formerly 815ad5b07d
[formerly 306842b297
] [formerly 612d4fca1f
] [formerly 917bc533d6
[formerly 612d4fca1f
[formerly 30086ab14cfaab149a689b84803ac906754ddd13]]]]
Former-commit-id: 917bc533d6
Former-commit-id: 72d844d751
[formerly 92e5f2df54
] [formerly acb15021906a2fbc2d6f7f79ec35350ccb2b9bf7 [formerly d94543a01c
]]
Former-commit-id: 85d4a2ff7305b1f728d24c90c0d09092160b681c [formerly 7ceaba25df
]
Former-commit-id: 25802d7d2d
2013-02-11 15:13:07 -06:00
Richard Peter
462d7f4e3c
Merge "Issue #1576 - updated qpid 0.18 rpms" into development
...
Former-commit-id: 1e07d66c7f
[formerly bb317b1acf
] [formerly 221a6e1ca1
] [formerly 1e07d66c7f
[formerly bb317b1acf
] [formerly 221a6e1ca1
] [formerly b774fadb60
[formerly 221a6e1ca1
[formerly 16b20a7f05e0a16ef02881a950bd541f7b4a4a1e]]]]
Former-commit-id: b774fadb60
Former-commit-id: 928aa2cfcc
[formerly 2e02b222f2
] [formerly 247a9d4fe6c3743d5405cc1ae8912c81d4b14a04 [formerly fa4dd004f9
]]
Former-commit-id: 82f2b9bfe531f0692c01403cca357d9bf19a2038 [formerly b4192e72c8
]
Former-commit-id: 7fbd24e723
2013-02-05 09:25:55 -06:00
Bryan Kowal
66a9f439b3
Issue #1576 - updated qpid 0.18 rpms
...
- the broker-plugins/management-jmx module is now built
- the broker-plugins-management-jmx plugins and the common-management plugins are now included in the rpms
Change-Id: I273772b2fb8f339a55cc3e523f90ca3b2398b222
Former-commit-id: e839188ca1
[formerly 145cd06eae
] [formerly 1678618015
] [formerly e839188ca1
[formerly 145cd06eae
] [formerly 1678618015
] [formerly 09523f1e84
[formerly 1678618015
[formerly c43c4268ba13e5758dfb4c504d57dead5ae89d63]]]]
Former-commit-id: 09523f1e84
Former-commit-id: 3d6d5e37b7
[formerly fe70d57c36
] [formerly 86ff68fed5e171beed0483e50df55cec431c39b9 [formerly 513bda11bc
]]
Former-commit-id: cb08005a122e513c75f9e40399cc85c13a1ddd35 [formerly 88d5830873
]
Former-commit-id: c92b997909
2013-02-04 12:31:23 -06:00
Brad Gonzales
b27bb93cf7
Issue #1517 Added SPC Prob menu changes.
...
Amend: Moved derived parameter files to cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/
Moved Spc.ppy to edexOsgi/build.edex/esb/data/utility/edex_static/base/smartinit/
Updated units in spcGuideNDFD.xml.
Removed local configuration menu items and tags.
Updated pqact.conf.template SPC entry.
Update SPC.py with levels.
Change-Id: I0f7a148d5e122b26c125bfee110019d5f577bdc1
Former-commit-id: 7cef72a460
[formerly 35cc853c74
] [formerly f459554e33
] [formerly 7cef72a460
[formerly 35cc853c74
] [formerly f459554e33
] [formerly 5bc6dd5498
[formerly f459554e33
[formerly a84415dcfc5dd1d330ef8022f496b2e2ee45c54d]]]]
Former-commit-id: 5bc6dd5498
Former-commit-id: 3e4338339b
[formerly 8fc5c18ebd
] [formerly 62d4c20906235f41b4a9b49850da7af9a09a8dfd [formerly f3ef309293
]]
Former-commit-id: 8092a6222319cfb79a0aacf062d8e75239f377da [formerly adbfa7ced1
]
Former-commit-id: 7253bbf20e
2013-02-04 08:52:33 -06:00
Steve Harris
a8d7e2a51a
Merge branch '13.2.1_delivery' into development
...
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: f207d282bc
[formerly c218786986
] [formerly 658bea377b
] [formerly f207d282bc
[formerly c218786986
] [formerly 658bea377b
] [formerly ec56acde81
[formerly 658bea377b
[formerly 60b2fd0496097fb1086207cbb01779dbfea877a0]]]]
Former-commit-id: ec56acde81
Former-commit-id: 41b14f0fa2
[formerly 73d9455c65
] [formerly 60daaf3ef91fb7f1318c36d98b7b63e339bd5c61 [formerly 6383bf8ed2
]]
Former-commit-id: 96b2d429acce04d3a7b895e5c4de0e318433555e [formerly a74d58ce6f
]
Former-commit-id: 2107a54161
2013-01-31 10:19:14 -06:00
Steve Harris
3165545bb6
Issue #1408 - Merge branch 'ss_builds' (13.2.1-3) into 13.2.1_delivery
...
Former-commit-id: e6093b159e
[formerly e655d297f7
] [formerly 0505ed0a72
] [formerly e6093b159e
[formerly e655d297f7
] [formerly 0505ed0a72
] [formerly 6040272573
[formerly 0505ed0a72
[formerly 70ddefcaed9acb5b220faf36693a91ab43a508e2]]]]
Former-commit-id: 6040272573
Former-commit-id: c9bc690eca
[formerly 75f6e61e6f
] [formerly 53394d76c4582419b448c742c4d56f7d91e3eff7 [formerly 513d49939f
]]
Former-commit-id: 97adf3dc9cd6eed17f75fee6569131485caea1a3 [formerly ba97151132
]
Former-commit-id: 99bc358644
2013-01-29 15:57:21 -06:00
Steve Harris
d552dc5ffb
13.2.1-3 baseline
...
Former-commit-id: b84acc06da
[formerly 283147571f
] [formerly f45120a1f4
] [formerly b84acc06da
[formerly 283147571f
] [formerly f45120a1f4
] [formerly 7a739c6a5b
[formerly f45120a1f4
[formerly fc7291332a08966a746605aef725e1947ec9643c]]]]
Former-commit-id: 7a739c6a5b
Former-commit-id: 03989493ae
[formerly daca1c3e73
] [formerly aad469752c5128fb65382f8daefbea8fbb0e4069 [formerly 3edfa1e0be
]]
Former-commit-id: 4abc68d3bc26a4259383e44830f853678146e7ed [formerly dbaf4a3e39
]
Former-commit-id: 9ab34b7aeb
2013-01-29 15:52:43 -06:00
Bryan Kowal
aa1f7e6364
Issue #1537 - fixed the edex-environment build
...
Former-commit-id: 792230a38e
[formerly a960b34230
] [formerly 7116bb86ef
] [formerly 792230a38e
[formerly a960b34230
] [formerly 7116bb86ef
] [formerly fa511e980b
[formerly 7116bb86ef
[formerly 4b9bd72e929e36d5c949589d5cc4ed6648a069ac]]]]
Former-commit-id: fa511e980b
Former-commit-id: a8d1496454
[formerly f4e7bead66
] [formerly 7a615a201ed2fac7d12eeef3455b28a530f92660 [formerly aefeada9d6
]]
Former-commit-id: cd37885a8c1aaa8da5e718615e2a2a711aa7c798 [formerly 662f471e5e
]
Former-commit-id: 1377ae600f
2013-01-29 09:51:54 -06:00
Bryan Kowal
1ecf83c57c
Issue #1503 - initial commit for build of Qpid 0.18 rpms
...
-created a qpid service script
Change-Id: I380333efad2954e7a9b6d1b27dc8a497cf38acf3
Former-commit-id: 7b4935a0ef
[formerly ec584b4d4b
] [formerly ff34587e94
] [formerly 7b4935a0ef
[formerly ec584b4d4b
] [formerly ff34587e94
] [formerly 54697ff658
[formerly ff34587e94
[formerly ee5806c98eb57680403e4f7768f92af1faa75de4]]]]
Former-commit-id: 54697ff658
Former-commit-id: f8e120a219
[formerly 45dd0b02ff
] [formerly 32df1491d555132dea478823ea8d5513fb36a0d5 [formerly 0cf405d8d9
]]
Former-commit-id: 82ecdb55cbcc1cd43992ca51e32b92ab48329fec [formerly ce2d246314
]
Former-commit-id: b7f7312c7d
2013-01-28 11:21:24 -06:00
Steve Harris
5d7a0ba9af
13.2.1-2 baseline
...
Former-commit-id: 74bfe9595c
[formerly 0006a2b6cb
] [formerly 7a7f7c45ca
] [formerly 74bfe9595c
[formerly 0006a2b6cb
] [formerly 7a7f7c45ca
] [formerly c3e4551dfa
[formerly 7a7f7c45ca
[formerly b8762009cb6f3bfa17984c2dcce65d5a48c6a844]]]]
Former-commit-id: c3e4551dfa
Former-commit-id: 0f4fcd0ba8
[formerly 251a9c0195
] [formerly 5477d57f4fbcde663b844cacbae089a9292a22a1 [formerly 1153d80c5b
]]
Former-commit-id: a3e63c2bb7b23736c07cc90370ea39a5d96fd1a5 [formerly 27706b8dcb
]
Former-commit-id: eafa141b90
2013-01-25 09:07:12 -06:00
Steve Harris
264b5bb073
13.2.1-3 baseline
...
Former-commit-id: 7d2e979c51
[formerly a5a0da5c02
] [formerly 7435527b25
] [formerly 7d2e979c51
[formerly a5a0da5c02
] [formerly 7435527b25
] [formerly 2b6ac028bd
[formerly 7435527b25
[formerly ba03739c3528638c5383528fd64674ae5af1ed64]]]]
Former-commit-id: 2b6ac028bd
Former-commit-id: d069467e81
[formerly 9d248cff7a
] [formerly 32e4736725f3f6d880854f4dba7503e4939e28b7 [formerly cc0fdef15c
]]
Former-commit-id: 1062fcca38400bed252816a16308c04554196b61 [formerly 082e66584a
]
Former-commit-id: ab562e22a4
2013-01-23 11:24:17 -05:00
Steve Harris
b92dfd1b62
13.2.1-2 baseline
...
Former-commit-id: a4fa438a41
[formerly 33bc5fd816
] [formerly 83e9157df7
] [formerly a4fa438a41
[formerly 33bc5fd816
] [formerly 83e9157df7
] [formerly 328c6dccad
[formerly 83e9157df7
[formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]]]
Former-commit-id: 328c6dccad
Former-commit-id: ce726fadc7
[formerly d9be4dce21
] [formerly f30d6bb5c391ebffda9767fba913019b2cd7d050 [formerly 47cc08ac79
]]
Former-commit-id: 281ab815ed143a9ff49cedae7054da06195e3c69 [formerly 547c1dedd1
]
Former-commit-id: 2779f5c6d9
2013-01-23 11:18:44 -05:00
Steve Harris
2c834d0f58
13.2.1-1 baseline
...
Former-commit-id: 11b05eedeb
[formerly 48d1aa7732
] [formerly 9771dfae6b
] [formerly 11b05eedeb
[formerly 48d1aa7732
] [formerly 9771dfae6b
] [formerly c63f9bcae0
[formerly 9771dfae6b
[formerly 6831a29efca54cfde39ab6a462f76ca2ac206f49]]]]
Former-commit-id: c63f9bcae0
Former-commit-id: 1d1791b3b4
[formerly 8ed6a53113
] [formerly b971e3aabeeb8f14462f7ad6502dafe876153e63 [formerly f6670806bf
]]
Former-commit-id: c7cd6e75591b001d138f41ea10b2ed691477e255 [formerly 9146e727f9
]
Former-commit-id: 08bf724a6c
2013-01-23 11:13:03 -05:00
Bryan Kowal
9d54be13f0
Issue #1490 - updated edex-environment
...
- actually include the modified files in the commit this time
- each edex environment will now receive its own instance of pypies
- a httpd-pypies port and a pypies logging port must now be specified when creating an edex environment
- the location of the pypies configuration file is no longer hard-coded; specified as an environment variable
- made the pypies tcp logging port configurable
- add source headers
- the configuration will now update the ServerRoot
Change-Id: Ie4130caad91f027c9ab547806fb014c0e708596d
Former-commit-id: 3a0114558b
[formerly 792c03d5f4
] [formerly b4964c0a19
] [formerly 3a0114558b
[formerly 792c03d5f4
] [formerly b4964c0a19
] [formerly 9e33969536
[formerly b4964c0a19
[formerly c96d7532679555f3ccf8a0d7bc07866e63ac177f]]]]
Former-commit-id: 9e33969536
Former-commit-id: a9c31457b8
[formerly bc757e5bc1
] [formerly 912fb037ce61d59d861a7468a62b5455d51ea0aa [formerly b47d484e70
]]
Former-commit-id: 6761c929373e609a39f863ab492cf3ace10a97b7 [formerly 75d8250852
]
Former-commit-id: 7ae14fdb20
2013-01-18 12:44:37 -06:00
Roger Ferrel
815dd12ad9
Issue #1442 Changes to update display when Simulated Time is changed. Corrections to pqact.conf.template.
...
Changes based on code review and added listener to GridManager and unit test.
Change-Id: Ida593a7e3cc7d4fd9bd6f44a4455145114484650
Former-commit-id: 863bdb4d52
[formerly 972db12324
] [formerly 1cd076671c
] [formerly 863bdb4d52
[formerly 972db12324
] [formerly 1cd076671c
] [formerly 1e492b81ff
[formerly 1cd076671c
[formerly 7f70c2f65453db6bf3097ae8157511c38a36b136]]]]
Former-commit-id: 1e492b81ff
Former-commit-id: 96deac5f43
[formerly 86d51634dc
] [formerly ea2ddcc686b917f0c5feca15fbe115c2be0949d6 [formerly f10521f861
]]
Former-commit-id: 06cef0013d52ca86020642bf82ef1a6b6988048f [formerly 722708105f
]
Former-commit-id: 0435636b1e
2013-01-16 16:53:29 -06:00
Richard Peter
0a55bcfd67
Merge branch 'ss_builds' (13.2.1-1) into development
...
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 6e42fa32d3
[formerly a966546e31
] [formerly 3fb7d96ec1
] [formerly 6e42fa32d3
[formerly a966546e31
] [formerly 3fb7d96ec1
] [formerly 1dbb34523b
[formerly 3fb7d96ec1
[formerly 1a07daa97b2000f31ea4fd98890a15477b85b5f3]]]]
Former-commit-id: 1dbb34523b
Former-commit-id: d880361e06
[formerly 79ef100838
] [formerly 85a5d2a8fdf64c0ba9efe9815c5ef9cb8f27eb62 [formerly 345dfd2ca9
]]
Former-commit-id: ef42f50f6a062518b4a0d8effc537eaf4c7292a1 [formerly cd2014bf8d
]
Former-commit-id: e838f2db25
2013-01-14 18:07:17 -06:00
Steve Harris
e5f32a2bbe
13.2.1-1 baseline
...
Former-commit-id: 8dd688c878
[formerly 5dfe4d10f1
] [formerly e62172c8c7
] [formerly 8dd688c878
[formerly 5dfe4d10f1
] [formerly e62172c8c7
] [formerly 81849e3cbb
[formerly e62172c8c7
[formerly 30d12654dea302c2bb0546edcb3b7ddd04ddd046]]]]
Former-commit-id: 81849e3cbb
Former-commit-id: 3d35fd52d5
[formerly e34695538d
] [formerly c835df6c612355b23abcc04a384d5b398d1c5ec6 [formerly 8713dfc5ca
]]
Former-commit-id: d5a28dcde502767d0f84d7301207580849e0a584 [formerly ebff2a6275
]
Former-commit-id: b4556ea28f
2013-01-14 18:42:21 -05:00
Richard Peter
031bae3bfd
Issue #1408 : Merge branch 'ss_builds' (13.1.2-8) into development
...
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/GridLookupFileName.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/NcgribFileNameProcessor.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/dbscandb.c
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/proto_gemlib.h
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/uscore.h
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/EnsembleSelectComposite.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/NcEnsembleResourceData.java
Former-commit-id: 4e1f66abb3
[formerly ae3ea75cbf
] [formerly 1318f53902
] [formerly 4e1f66abb3
[formerly ae3ea75cbf
] [formerly 1318f53902
] [formerly b8e42dabc0
[formerly 1318f53902
[formerly 90066bd215f4c547dfd483cec7c415c1e6fccece]]]]
Former-commit-id: b8e42dabc0
Former-commit-id: 9da3b7e2dd
[formerly fa6247baf7
] [formerly bb2a6cb1f185f4b5c4f896fbc2ccaf6004754a84 [formerly aa9e16b038
]]
Former-commit-id: 353348b43765265bcb9885b4db6864c6e23d0b07 [formerly 096134d917
]
Former-commit-id: ef2dc06b69
2013-01-14 17:38:38 -06:00
Steve Harris
32c48861de
13.1.2-8 baseline
...
Former-commit-id: 5aaacf4eec
[formerly b864fdc303
] [formerly e6217a17de
] [formerly 5aaacf4eec
[formerly b864fdc303
] [formerly e6217a17de
] [formerly 06b8eb8db0
[formerly e6217a17de
[formerly c8797ef99646b2e093ad60cb9a6ee9643405a13f]]]]
Former-commit-id: 06b8eb8db0
Former-commit-id: 13be9f8987
[formerly 7d0109a349
] [formerly d0dddac1b9c0f73936bff6a2a8424513b3f8a42d [formerly 3caf592e83
]]
Former-commit-id: 93a11a781554c0d3f113b98ce41624b35a753e8d [formerly 066c14dcd2
]
Former-commit-id: 92f1e9416c
2013-01-11 16:19:07 -05:00
Richard Peter
7d529beed2
Issue #1408 : Merge 13.1.2-6 into development
...
Former-commit-id: 95f0508c29
[formerly d0a6ba23e5
] [formerly 029ebaa63a
] [formerly 95f0508c29
[formerly d0a6ba23e5
] [formerly 029ebaa63a
] [formerly 328be6ac2b
[formerly 029ebaa63a
[formerly 7f8ad9de743a19d21a6784fa7563a88c6bdd4d3c]]]]
Former-commit-id: 328be6ac2b
Former-commit-id: 177a54d19a
[formerly 80bf1d7a28
] [formerly e62c56e99c7920d8884c0d3271ccfd750504bf46 [formerly 6a5a0d7d09
]]
Former-commit-id: 8e36b37de071d25b4a9a89babcf0974ae973fdbe [formerly 709af3b25e
]
Former-commit-id: 398b47967d
2013-01-09 17:55:05 -06:00
Bryan Kowal
904678e8f4
Issue #1455 - Merge 5-Data_Delivery into AWIPS2_baseline
...
Former-commit-id: 199e202979
[formerly ab8b346489
] [formerly c8a43edd9e
] [formerly 199e202979
[formerly ab8b346489
] [formerly c8a43edd9e
] [formerly d6b4cb65f4
[formerly c8a43edd9e
[formerly b535a90fb25287945485c10b3c85749c11285171]]]]
Former-commit-id: d6b4cb65f4
Former-commit-id: 0e985cf0f3
[formerly 6d7f57c62a
] [formerly acd3a92b4c1f1e4b7e0fc18eb618a5d77643ccb8 [formerly 146c43a606
]]
Former-commit-id: caceba3a84e843b279eb8a807b33e26d81487e49 [formerly 0136f9d5a3
]
Former-commit-id: 1996f92f7e
2013-01-07 12:16:01 -06:00
Steve Harris
3e63f280a2
13.1.2-6 baseline
...
Former-commit-id: 1d4d25b49b
[formerly efd3392abe
] [formerly 8e5f9e0e6c
] [formerly 1d4d25b49b
[formerly efd3392abe
] [formerly 8e5f9e0e6c
] [formerly 59969775ad
[formerly 8e5f9e0e6c
[formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]]]
Former-commit-id: 59969775ad
Former-commit-id: fe763963e9
[formerly 82a1ed77a4
] [formerly fa884fbcd584330564fea44a1538e11036e753a8 [formerly dbcae57f57
]]
Former-commit-id: 385d5b42196eb703cc60637c47506c02c454b5fc [formerly 05bdc0ecd2
]
Former-commit-id: b7f180d9d3
2013-01-06 14:55:11 -06:00
Steve Harris
745f2c6409
13.1.2-2 baseline
...
Former-commit-id: e8f4a2f031
[formerly 51208e5515
] [formerly c0c1d56f3a
] [formerly e8f4a2f031
[formerly 51208e5515
] [formerly c0c1d56f3a
] [formerly 4ba416aeb3
[formerly c0c1d56f3a
[formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 82cdde8491
[formerly cd4185ef5c
] [formerly 413d9d9811179a10639f756b8b4f690d86be7a6a [formerly 941337c553
]]
Former-commit-id: c69e1900269e630aefc061c2464bc8fea1c9776a [formerly b6fa9b4858
]
Former-commit-id: f52ec0b0a0
2013-01-06 14:32:24 -06:00
Bryan Kowal
5ca7008802
Issue #1373 - prevent file naming conflicts
...
Change-Id: Ibf3996983a0df3eee39fd5bc7d65bf43044c0e02
Former-commit-id: a4576aeb23
[formerly 94fe1c8f59
] [formerly 9079c2dd3f
] [formerly a4576aeb23
[formerly 94fe1c8f59
] [formerly 9079c2dd3f
] [formerly 2c9e5d68fa
[formerly 9079c2dd3f
[formerly b7c11d1a5d55908a9e60e29b68fa01bf924c1429]]]]
Former-commit-id: 2c9e5d68fa
Former-commit-id: 9cea52c3bd
[formerly 5aed64be97
] [formerly 9dd0aeae5d8737f589956e4d1a2827d65b6fc693 [formerly 6580901b03
]]
Former-commit-id: a947744e5f5de62fe560f0217c5e2740f6988cc9 [formerly ad30a7fb6a
]
Former-commit-id: 7138f2a20f
2013-01-05 10:40:10 -06:00
Bryan Kowal
95c7ef5aa6
Issue #1373 - the edexServiceList script will now be packaged in the edex-base and the datadelivery rpms
...
Former-commit-id: 09fe6a9c03
[formerly 2d9e54ddf8
] [formerly 9062ed93d7
] [formerly 09fe6a9c03
[formerly 2d9e54ddf8
] [formerly 9062ed93d7
] [formerly e131b5bc72
[formerly 9062ed93d7
[formerly 96fe189b5af5fbf0424504cc0b27d44c1defc0c2]]]]
Former-commit-id: e131b5bc72
Former-commit-id: 2cb595f8bb
[formerly ce21e23e52
] [formerly 4cab8f42ca65f8a1e9fd3656f1c5391c169ad000 [formerly 8a4bc85bad
]]
Former-commit-id: c01dc89b759f5950dcb70e67442b4d828bcb5b58 [formerly d2cd60bb5c
]
Former-commit-id: a14d25ded0
2013-01-04 12:50:37 -06:00
Richard Peter
7aaec36c1f
Issue #1373 : Update jvm startup to load a service list for services to start.
...
Former-commit-id: f941605942
[formerly af5b616282
] [formerly 1c560f5013
] [formerly f941605942
[formerly af5b616282
] [formerly 1c560f5013
] [formerly c1765f776c
[formerly 1c560f5013
[formerly b58fed7cb8f04d26397eb9df2273be6588737035]]]]
Former-commit-id: c1765f776c
Former-commit-id: 38c6856d3c
[formerly 9f991104dd
] [formerly b3978f7df010c7a6841e8680eae5b357ababaca4 [formerly 424cb12ef6
]]
Former-commit-id: 56d8351962d633cfe957c08f60babdaea17194e8 [formerly 6fd64a20fa
]
Former-commit-id: e8d1469a70
2013-01-03 16:27:32 -06:00
Richard Peter
a78970da48
Merge "Issue #1411 Corrections to pqact.con.template and fix in palt.c to handle data patterns properly." into development
...
Former-commit-id: 218b69a387
[formerly 314bcffd15
] [formerly c3e9f40479
] [formerly 218b69a387
[formerly 314bcffd15
] [formerly c3e9f40479
] [formerly 45f901c1b0
[formerly c3e9f40479
[formerly da48ac436f44dcff85723dfd5befaee9101b6978]]]]
Former-commit-id: 45f901c1b0
Former-commit-id: 38ae6f7f0a
[formerly a608ba1a88
] [formerly f773ae0c7fbeaee4d49304db8a1346465706b19a [formerly 54778e7490
]]
Former-commit-id: cf8ab4529958f51c5a76113bfdaf60b39b30dab3 [formerly 7c4641be8e
]
Former-commit-id: cec63c30c7
2012-12-18 13:08:40 -06:00
Roger Ferrel
c0e1ddbbea
Issue #1411 Corrections to pqact.con.template and fix in palt.c to handle data patterns properly.
...
Change-Id: I1f9f5b25d833c14031b9eb257c175de81bc146dc
Former-commit-id: ecec7603df
[formerly 8c4e70fa9a
] [formerly 0c5d10e66a
] [formerly ecec7603df
[formerly 8c4e70fa9a
] [formerly 0c5d10e66a
] [formerly 43fd607a30
[formerly 0c5d10e66a
[formerly c1567c66f77077f9411a04f349a17d368424db5f]]]]
Former-commit-id: 43fd607a30
Former-commit-id: 50d3a97bcc
[formerly 07fbeb2928
] [formerly 6ca37b251db62a9996f567e8425299a3fb6ce14e [formerly 6d4946290f
]]
Former-commit-id: 78c26237d387d6f1192593fb48dd3b17a26a6cb5 [formerly 95e6d9e752
]
Former-commit-id: 7143fb78dd
2012-12-18 09:00:46 -06:00
Bryan Kowal
15db8f220d
Issue #1416 : added the python package shapely
...
- shapely and dependencies will now be built as part of the
32-bit build and the 64-bit build from source
- shapely will also be included as part of the AWIPS II
MSFT Windows environment
Former-commit-id: efe8f338b0
[formerly ef0b12813d
] [formerly 8d1e29448a
] [formerly efe8f338b0
[formerly ef0b12813d
] [formerly 8d1e29448a
] [formerly 5e22c24657
[formerly 8d1e29448a
[formerly 82872ebbfb8f2793fb7d95842d33ba8a0cd41ae6]]]]
Former-commit-id: 5e22c24657
Former-commit-id: f8df1139b2
[formerly 976834171e
] [formerly 6b0159b5868c1e9370ac2d621cc75a1b66d8575f [formerly 6103e7c485
]]
Former-commit-id: 4b295307c700c42336969a858b4e15f0db107e36 [formerly bf96e5cf59
]
Former-commit-id: f48df7de50
2012-12-17 15:27:43 -06:00