Ron Anderson
89e87a1683
Issue #2331 Fixed Topo retrieval for smartTools/procedures
...
Change-Id: Iab9d5216f278836f3b8b2245330fdb2b254a5ae3
Former-commit-id: b5906249cc
[formerly b5906249cc
[formerly a7a201ec657a333f6e6f5c3c1d12a3d1f9b50a4c]]
Former-commit-id: 20eeb2796e
Former-commit-id: 103fed386f
2013-12-04 17:10:48 -06:00
Steve Harris
234ca267ed
14.1.1-12 baseline
...
Former-commit-id: b24d9c80b0
[formerly b24d9c80b0
[formerly 3b3b8ffbdadc65f41b67f2d649ec18e19521c989]]
Former-commit-id: a3ec45a99f
Former-commit-id: 14421048af
2013-12-04 16:47:59 -05:00
Richard Peter
8cdd151d64
Merge "Issue #1736 Add registry bandwidth tracking Change-Id: Ic8b2a845095482aa117289c3fd68cd20b1bb87e6" into development
...
Former-commit-id: ea7dac5993
[formerly ea7dac5993
[formerly 2cef3f9742ac0dcff0e9d90507abc30714e8548f]]
Former-commit-id: 0281447166
Former-commit-id: f6808e6623
2013-12-04 12:00:40 -06:00
Dave Hladky
dc5f5f3c87
Issue #1736 Add registry bandwidth tracking
...
Change-Id: Ic8b2a845095482aa117289c3fd68cd20b1bb87e6
Former-commit-id: 483ec5d22f
[formerly 483ec5d22f
[formerly 695365c03ac142960a22e6774f3a10fd5e16cd35]]
Former-commit-id: 593f24023d
Former-commit-id: 4060748634
2013-12-04 11:58:49 -06:00
Richard Peter
cd1aebbf03
Issue #2170 : Fix DataUriRouter Java 1.6 compliance
...
Change-Id: Iae25b28498f8fec8c76b764c3214f494acdde992
Former-commit-id: b02490146a
[formerly b02490146a
[formerly 6f38a006d33217389975a3cfeeda9c1bed928c13]]
Former-commit-id: 623fb3b71a
Former-commit-id: b627f93141
2013-12-04 09:53:00 -06:00
Richard Peter
0932f3103b
Issue #2551 : Update NCEP objects to extend PersistablePluginDataObject.
...
Amend: Remove IDecoderGettable.
Change-Id: Ic01ebe373da1946a992e10150c1da34119e10d6b
Former-commit-id: 98117b4093
[formerly 98117b4093
[formerly 0778a7f0123dd150894458fef6958fcdd9da39b6]]
Former-commit-id: f8f3ebc6e9
Former-commit-id: 1a554d9632
2013-12-03 17:24:01 -06:00
Richard Peter
b0e694483f
Merge branch 'development_on_RHEL5' (GOES-R) into development
...
Conflicts:
cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatBlendedResource.java
nativeLib/edexBridge/edexBridge.cpp
rpms/build/i386/build.sh
rpms/build/x86_64/build.sh
Former-commit-id: f5f75ec629
[formerly f5f75ec629
[formerly 039d9ecb587338801cdab9cad11b06890517d6a4]]
Former-commit-id: e82e1137f9
Former-commit-id: 94994868fa
2013-12-03 16:25:31 -06:00
Richard Peter
2648f04f41
Merge "Issue #2537 Serialize empty enum sets. Change-Id: Iff5aec625ddb03a069fb3a31fe1ff961e027d6f2" into development
...
Former-commit-id: ce4a95a082
[formerly ce4a95a082
[formerly ba1eadae31abadb655d3752a06c726aaf8f9adc5]]
Former-commit-id: 37c08d3e82
Former-commit-id: 8a301388e1
2013-12-03 12:53:26 -06:00
Ben Steffensmeier
f09a350189
Issue #2537 Serialize empty enum sets.
...
Change-Id: Iff5aec625ddb03a069fb3a31fe1ff961e027d6f2
Former-commit-id: f460896552
[formerly f460896552
[formerly 0dabccd03145857b75fe90260b4d52e1541c5591]]
Former-commit-id: f7be93daa7
Former-commit-id: 74e182ad5e
2013-12-03 12:17:01 -06:00
Richard Peter
ceaca5b674
Issue #2051 : Fix Shef PurgeText
...
Change-Id: I7c72b69c9e0088943c279c824dfc5784d0f9baac
Former-commit-id: 97fe8bd24b
[formerly 97fe8bd24b
[formerly f6d47991f62e99fa72ffafc2b6175eff8a0a83ac]]
Former-commit-id: a2028de5bc
Former-commit-id: 86d08ef574
2013-12-03 11:41:22 -06:00
Richard Peter
ff5fbcf012
Issue #2170 : Update Plugin Notification Framework
...
Change-Id: I2ec99fadbe2f383bb0892c59601350395f1e5277
Former-commit-id: 2085a9cd33
[formerly 2085a9cd33
[formerly 081a19d5cfca3d717a332357dbaead199767e0b8]]
Former-commit-id: fbda83aeb9
Former-commit-id: f7f9a4e57c
2013-12-03 11:41:21 -06:00
Richard Peter
ceccd412dc
Merge "Issue #2582 Fix decoding where OBS DTG are on separate lines, cleanup VAA and remove dataURI" into development
...
Former-commit-id: 10f32b5fc7
[formerly 10f32b5fc7
[formerly 62a6bb9b7fcf05701a26553a502cc33fc28a5c6b]]
Former-commit-id: 02b11b3509
Former-commit-id: 3113fe26cd
2013-12-02 16:52:40 -06:00
Nate Jensen
cbd12d4cc7
Issue #2582 Fix decoding where OBS DTG are on separate lines, cleanup
...
VAA and remove dataURI
Change-Id: I984173a6e85eb7dc269fb98964af4915a9b5105e
Former-commit-id: 6bf1fd8d3c
[formerly 6bf1fd8d3c
[formerly 148e7113abefd684dcacb5ccc28bb77192ff45c8]]
Former-commit-id: 72c322c667
Former-commit-id: 2831ceb356
2013-12-02 16:10:26 -06:00
Steve Harris
f88a635a58
14.1.1-11 baseline
...
Former-commit-id: 70a6f1936e
[formerly 70a6f1936e
[formerly c32b2b2037c84cc074e7dc5a5a13b93223640d7d]]
Former-commit-id: 71ae71c850
Former-commit-id: 5526a8999d
2013-12-02 17:10:10 -05:00
Brad Gonzales
c596c6f672
Issue #2541 Added exclude patterns to RequestPatterns.
...
Added an exclude pattern to grib.xml to exclude data delivery sbn files.
Change-Id: Id92865e1b58bdcf3744328bd0362636093a03521
Former-commit-id: dc7e255d43
[formerly dc7e255d43
[formerly 396a9a99863ce9a616eecde6466f1c4d43b8d566]]
Former-commit-id: 8acfa99e77
Former-commit-id: dd8eb8c2b4
2013-12-02 11:44:09 -06:00
Benjamin Phillippe
878f9fe3ea
Issue #2534 Added reciprocated registry replication subscriptions
...
Change-Id: I6844d65ccab6c4246f37ce212fa17af09851da27
Former-commit-id: 212bbeb379
[formerly 212bbeb379
[formerly 2c52a6ee6f7d491d484c423359b8440975ad6d1e]]
Former-commit-id: 31b53f4ad9
Former-commit-id: 2fa17aab7f
2013-11-27 12:07:59 -06:00
Nate Jensen
3b00fc37a5
Merge "Issue #2537 point data code cleanup." into development
...
Former-commit-id: 9a4a4fba2d
[formerly 9a4a4fba2d
[formerly 8ccafcec9155bdab49d4d41c3a463323946f1850]]
Former-commit-id: d9ab670d45
Former-commit-id: 0a936e860a
2013-11-26 17:48:53 -06:00
Ben Steffensmeier
14d7341d68
Issue #2528 Allow geostationary data to display on an identical projection.
...
Change-Id: I930cd35a2e2fd7f6b1347cd9d5063fe9cd578d46
Former-commit-id: 048f968147
[formerly 048f968147
[formerly c2b5cca6c1c02122a8d006704f415868debe4f75]]
Former-commit-id: 59d806fa7e
Former-commit-id: 37f6acbb99
2013-11-26 17:38:29 -06:00
Ben Steffensmeier
63d163c00e
Issue #2574 Fix conversion of null grid coverage in dataURI.
...
Former-commit-id: 21f0abbca1
[formerly 21f0abbca1
[formerly 38352d01b6a4d85bd6961d791370db87d8800bf2]]
Former-commit-id: 6d14edd0a8
Former-commit-id: 089bdf97cb
2013-11-26 15:19:31 -06:00
Ben Steffensmeier
8c386a2aac
Issue #2537 point data code cleanup.
...
Former-commit-id: a4e3a4a03b
[formerly a4e3a4a03b
[formerly 8809ac9faa7669e7a0817b9b1c15c322b05e06a2]]
Former-commit-id: 7889c14b35
Former-commit-id: 62ca7b1df6
2013-11-26 15:16:54 -06:00
Ben Steffensmeier
b1de6a34eb
Issue #2574 Add DataURIFieldConverter for GridCoverages.
...
Former-commit-id: 08be03d3fa
[formerly 08be03d3fa
[formerly 452e129cda35ffe0b4b8d9bd262bd80bfa88d701]]
Former-commit-id: bdb0e111ea
Former-commit-id: f7b1015dca
2013-11-25 12:17:36 -06:00
Ben Steffensmeier
a3f5fcabf6
Issue #2492 Got mosaicing to happen in mosaic image units, satellite provides data units for images
...
Change-Id: I5a244397aa6172e406df1d0f4619dd53373584e0
Former-commit-id: 927801985a
[formerly 927801985a
[formerly 029c03379ffa8317fa0afe8b2f69cbe1ac3c3fd1]]
Former-commit-id: 3696896b49
Former-commit-id: 70ca78c7b5
2013-11-25 11:31:57 -06:00
Dave Hladky
54af53ffb4
Issue #2554 added explicit threading to WFS, ability to send GZIP requests, fixed maxfeatures, fixed adhoc display
...
Former-commit-id: 04c7e2cffc
[formerly 04c7e2cffc
[formerly e79ff905cbe3330dbe22b6663753e1d5e6dbe7bd]]
Former-commit-id: a9a3973319
Former-commit-id: ebd6d5cbe1
2013-11-21 14:46:47 -06:00
Nate Jensen
eb0f52cfca
Merge "Issue #2448 Fixed problem that set subscription start time to first cycle time. Fixed problem that set subscription end time to end of day." into development
...
Former-commit-id: 982a664301
[formerly 982a664301
[formerly 8c71361680cbe5860cbd4d76c3908cfbef23068f]]
Former-commit-id: 695262552f
Former-commit-id: 198ff37bd7
2013-11-21 08:36:59 -06:00
Brad Gonzales
70f66e5f7a
Issue #2448 Fixed problem that set subscription start time to first cycle time.
...
Fixed problem that set subscription end time to end of day.
Change-Id: Icccdbe4e38581f5194f6fde8d52f280d1a456a65
Former-commit-id: 93b47ce68b
[formerly 93b47ce68b
[formerly d8040be0d01c11fc7bfafe40a7afe509ba372ea0]]
Former-commit-id: d2cfc5986a
Former-commit-id: 04d7bff784
2013-11-20 15:49:27 -06:00
Ben Steffensmeier
c742abd06e
Issue #2528 Add brute force method of calculating geostationary envelope intersections.
...
Change-Id: Ie02ae1e493015dcca88468633db65c51cd701adf
Former-commit-id: 30d125f95a
[formerly 30d125f95a
[formerly 393aba6883e536912f7b1e34bd922d53eaa63727]]
Former-commit-id: 00af766143
Former-commit-id: 6faafa2dfc
2013-11-20 15:36:27 -06:00
Greg Armendariz
c94e59646b
Merge "Issue #2545 Renamed datadelivery edex impl files to facilitate modes exclusion. Added monilithic impl config file for a registry that runs as an ncf and wfo for devRegistry mode. Added empty site and shared and local subscription handlers to enable the FindSubscriptionHandler bean to be configured through spring. Fix for re-routing Insert and Update registry events as data set metadata events which was lost when the registry was configured to distinguish between insert and update events. Moved subscriptionRoutesToSchedule bean (and other beans specific to an implementation) to the ncf, wfo, and monolithic edex impl spring files. Removed the wfo and ncf specific code from HibernateBandwidthInitializer.executeAfterRegistryInit() since the customized subscription handlers will be injected through spring. Removed the SBN route from wfo mode." into development
...
Former-commit-id: 93daf9aff4
[formerly 93daf9aff4
[formerly 243e06d507ee85bfa7e30f5da41c146afa4d1043]]
Former-commit-id: bc6c4e2b32
Former-commit-id: ce2ef25207
2013-11-20 12:26:30 -06:00
Brad Gonzales
6e19c4dab1
Issue #2545 Renamed datadelivery edex impl files to facilitate modes exclusion. Added
...
monilithic impl config file for a registry that runs as an ncf and wfo for devRegistry mode. Added empty site and
shared and local subscription handlers to enable the FindSubscriptionHandler bean to be configured through spring.
Fix for re-routing Insert and Update registry events as data set metadata events which was lost when the registry
was configured to distinguish between insert and update events. Moved subscriptionRoutesToSchedule bean (and other
beans specific to an implementation) to the ncf, wfo, and monolithic edex impl spring files. Removed the wfo and
ncf specific code from HibernateBandwidthInitializer.executeAfterRegistryInit() since the customized subscription
handlers will be injected through spring. Removed the SBN route from wfo mode.
Amend: Comment updates from peer review.
Change-Id: Ic4c0dca8ebf1e86537e46a6231af58bb65c83cf8
Former-commit-id: 053f20c70b
[formerly 053f20c70b
[formerly c245f741b9e78d8e4503698336d9929536e72e0d]]
Former-commit-id: 95a1914c71
Former-commit-id: 04829d37e2
2013-11-20 11:58:33 -06:00
Brian Clements
2e4dc2000e
Issue #2393 removed pypies interpolation
...
updated datastore interface
updated pypies python code
updated python generated from java classes
moved in-java interpolation code from sat dao to utility classes
changed ncep mcidas dao to use in-java interpolation
changed VIIRS dao to use common interpolation code
Former-commit-id: fe58826a1e
[formerly fe58826a1e
[formerly 6f9ad823de5d0b30ae7c8206b4a4fdf1e3a2b22b]]
Former-commit-id: 0f40ae2b99
Former-commit-id: b762864f88
2013-11-20 08:40:12 -06:00
Bryan Kowal
91367f57b6
Issue #2552 - replace Logger with UFStatus
...
Former-commit-id: ff968c9884
[formerly ff968c9884
[formerly 10971eca8d10817c97073c6142ea7cf08b28fa27]]
Former-commit-id: 0bdb25bf43
Former-commit-id: da148196ac
2013-11-19 17:11:36 -06:00
Steve Harris
36d788890a
14.1.1-10 baseline
...
Former-commit-id: ca0f65bd9a
[formerly ca0f65bd9a
[formerly 6970b56e5970df5cd40ddfc41470324d652f0afd]]
Former-commit-id: 9248695a1f
Former-commit-id: ef6e0b0304
2013-11-19 16:40:25 -05:00
Nate Jensen
0015c66955
Merge "Issue #2552 - it is now possible to dynamically inject packages into the JaxbManager via Spring." into development
...
Former-commit-id: 6927e960b2
[formerly 6927e960b2
[formerly 59c62c673625d7e87b3b86575b8ebfb9e328ff28]]
Former-commit-id: 5885d8027b
Former-commit-id: be3d016f93
2013-11-19 11:25:19 -06:00
Nate Jensen
951c1ff2f3
Merge "Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE startup" into development
...
Former-commit-id: 4f47800cae
[formerly 4f47800cae
[formerly c27baf85e0eaf7f6dd6f2d36d19243ae37dc0dac]]
Former-commit-id: 0146ae59df
Former-commit-id: a238ba2ba3
2013-11-18 11:39:12 -06:00
Brad Gonzales
4499a8d1de
Issue #2545 EdexBandwidthManager check for subsription event types before sending notifications.
...
Added missing comma to com.raytheon.edex.plugin.text.
Change-Id: Ifc970d31d8f2db29dc5a4749967cdedad84b6162
Former-commit-id: aa8fb36fc1
[formerly aa8fb36fc1
[formerly f570f6fcd64a96b7c61eecdfae6a765ec643e718]]
Former-commit-id: 53d4de12d9
Former-commit-id: 490c95d010
2013-11-15 08:00:47 -06:00
Nate Jensen
f2c777ff48
Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE
...
startup
Change-Id: Iefa9c48f264c3ab4cf9d225d3e6420399c8b6700
Former-commit-id: dd99aa3f47
[formerly dd99aa3f47
[formerly 264b7c80cbd0559c175aef0a99d8f8407b6af7d0]]
Former-commit-id: 78b01f61c4
Former-commit-id: d96cdbe761
2013-11-14 17:41:24 -06:00
Richard Peter
38d2c6564a
Merge "Issue #2548 - Add a subscription type slot for uniqueness." into development
...
Former-commit-id: 14b1e924a1
[formerly 14b1e924a1
[formerly dba301df2f593baa951c14b684e7ce4794e32019]]
Former-commit-id: 0bb5e2a61e
Former-commit-id: 1a7dd7723b
2013-11-14 17:21:48 -06:00
Brian Clements
e7c355df52
Issue #2361 fixed ncwf hibernate pickup
...
the new way of finding hibernate classes requires project names to match package names
fixed ncwf to have matching package and project names
Former-commit-id: cacdf313c5
[formerly cacdf313c5
[formerly 4924917e28275d9bb8bb21feceb6016ce2c91c40]]
Former-commit-id: 00490c2db2
Former-commit-id: ab24330f23
2013-11-14 17:12:02 -06:00
Mike Duff
5fdf101af6
Issue #2548 - Add a subscription type slot for uniqueness.
...
Change-Id: I5cf04bde4a345606af72bf2091e423dd6aa555aa
Former-commit-id: 47011a70db
[formerly 47011a70db
[formerly 1ad7f83443c33f8b73d2ad8a9b2f574fd37db9e2]]
Former-commit-id: 47a0477587
Former-commit-id: b929b7aa02
2013-11-14 17:07:54 -06:00
Nate Jensen
7ec18ba0b1
Merge "Issue #2361 remove StyleManager's use of SerializationUtil and ISerializableObject" into development
...
Former-commit-id: b4bcd14a85
[formerly b4bcd14a85
[formerly f4d52a5312ba3352c99eb6a51f9ebf71d4ff0356]]
Former-commit-id: c2aacfc437
Former-commit-id: a8a1e396fe
2013-11-14 16:34:28 -06:00
Bryan Kowal
4275b195ce
Issue #2552 - it is now possible to dynamically inject packages into the JaxbManager via Spring.
...
Amend: datadelivery jaxables are now injected
Amend: created a getInstance method for EbxmlJaxbManager
Amend: use value instead of bean in spring configuration
Change-Id: Ib6c11b03964fbaeee24db352a8f0acc1b43fa3c0
Former-commit-id: be78fab116
[formerly be78fab116
[formerly 283853ead3588ef8ea296507b11a9ee9a23e9236]]
Former-commit-id: ce16efc9a1
Former-commit-id: a6ea71d46f
2013-11-14 15:17:28 -06:00
Richard Peter
e7d8e5e560
Merge branch 'development' into development_on_RHEL6
...
Former-commit-id: 8fb79e7b73
[formerly 8fb79e7b73
[formerly 13d284277bed2f0f731547ec443a262556df997c]]
Former-commit-id: c42f931118
Former-commit-id: 2b95bcfb31
2013-11-14 14:56:59 -06:00
Richard Peter
e2a16fd876
Merge branch 'omaha_14.1.1' (14.1.1-8) into development_on_RHEL6
...
Conflicts:
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
edexOsgi/build.edex/build.xml
edexOsgi/build.edex/esb/conf/log4j-ingest.xml
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.text/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/DatabaseArchiver.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/DefaultPluginArchiveFileNameFormatter.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IDataArchiver.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IPluginArchiveFileNameFormatter.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IPluginArchiver.java
nativeLib/rary.meteorological/src/solax.f
Change-Id: I188bbccdb3c6f4036577aa90074a990e2832b822
Former-commit-id: 79bdd34f4f
[formerly 79bdd34f4f
[formerly f7f30006cdaf3c8e99d166463c226b504f458b83]]
Former-commit-id: 0074b774f0
Former-commit-id: 96b4944b41
2013-11-14 14:40:23 -06:00
Lee Venable
84de0beae4
Merge "Issue #2540 - pure python module merge implementation" into development
...
Former-commit-id: d431f3c0f4
[formerly d431f3c0f4
[formerly dbb67d3e8dd56c057626f499b2e3aa6b06eac41f]]
Former-commit-id: bc7f5e556d
Former-commit-id: 17fef206fc
2013-11-14 14:33:18 -06:00
Richard Peter
ace2a71092
Merge "Issue #2505 removed recco from deployment" into development
...
Former-commit-id: 4d18c7d493
[formerly 4d18c7d493
[formerly 3e92bb969aef3508f08eb55a2ef1903030abc525]]
Former-commit-id: 3f5c590c5f
Former-commit-id: 3dc0ad184c
2013-11-14 13:30:09 -06:00
Nate Jensen
e83a828209
Issue #2361 remove StyleManager's use of SerializationUtil and
...
ISerializableObject
Change-Id: I08bb431fe2e622bb6836796c22c1e0ebdfb5175a
Former-commit-id: 9acda0b9f2
[formerly 9acda0b9f2
[formerly d390d3f8dab55dea038ebe516bfd0b6fd9e7d28d]]
Former-commit-id: c5cf68cc45
Former-commit-id: a6be904c69
2013-11-14 13:29:30 -06:00
Bryan Kowal
79045d620b
Issue #2540 - pure python module merge implementation
...
Amend: remove dead LocalizationUtil.py file. Use os.path.join; catch Exception thrown by module merge
Amend: remove module merge exception catching
Change-Id: Idb9bc359d8b3dc1b6c4ccfd6247e02e2905bbea1
Former-commit-id: 2029c34f24
[formerly 2029c34f24
[formerly c0595b49cab0d0ef636427ed3b31ea805f8adb43]]
Former-commit-id: 7e35ea310f
Former-commit-id: a2261b9ff3
2013-11-14 11:57:11 -06:00
Steve Harris
39e8f5ecc1
Merge branch 'development' into development_on_RHEL6
...
Former-commit-id: 473488f5b8
[formerly 473488f5b8
[formerly 2117af3beb252132a10f44aab162a1ca17ef3abd]]
Former-commit-id: 4d25eb11c8
Former-commit-id: ef852ac125
2013-11-13 23:20:18 -06:00
Richard Peter
58c8106da8
Merge "Issue #1686 Fixed GetAuditTrailByTimeInterval registry canonical query" into development
...
Former-commit-id: 2f3eee1439
[formerly 2f3eee1439
[formerly aa4b24c6ec834a3a33dcdb4a1b04645d17f2511f]]
Former-commit-id: e88f5777a7
Former-commit-id: 64afe42e74
2013-11-13 16:43:26 -06:00
Brian Clements
d94f44d406
Issue #2505 removed recco from deployment
...
added update script to drop recco from db
Former-commit-id: 95f1621d3e
[formerly 95f1621d3e
[formerly f4e66b8afce682014a0fa1ef9585b7ee6480e1e1]]
Former-commit-id: 8cbe2c06a8
Former-commit-id: 49c8bd5ee9
2013-11-13 13:45:44 -06:00
Bryan Kowal
1a905e8a3c
Merge branch 'development' into development_on_RHEL6
...
Conflicts:
rpms/build/i386/build.sh
rpms/build/x86_64/build.sh
Former-commit-id: 86dd200844
[formerly 86dd200844
[formerly 038cc7fd8c8dd54a67183f9c726b3c41d0c4e638]]
Former-commit-id: 0544b66f4e
Former-commit-id: 01735ca0c4
2013-11-13 13:16:55 -06:00