xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2164 commits 31 branches 40 tags 3.8 GiB
Commit graph

2164 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dustin Johnson
94300e0c1d Issue #1643 Standardize access for EDEX service requests, separate router code into its own Spring file. 
Change-Id: Ic32df9138b270d1e2c3a9d137d2ad292706ab5b7

Former-commit-id: 8038b840d8 [formerly 7852f88352] [formerly 88a9b953b6 [formerly 6ab17d82c5e4961e662acf80e26d23f3bbfaada2]]
Former-commit-id: 88a9b953b6
Former-commit-id: cc0254ba03
 2013-02-26 15:06:04 -06:00
Lee Venable
4212af7e8a Merge "Issue #1667 - Sort categories in the Stats Dialog's catgory drop-down" into development 
Former-commit-id: a4b41e0309 [formerly 9cf3ca07b7] [formerly 46ff81108a [formerly 26fa358838588643c003287d8125e58949c3648f]]
Former-commit-id: 46ff81108a
Former-commit-id: cb7fd87715
 2013-02-26 14:11:35 -06:00
Mike Duff
882c46dd85 Issue #1667 - Sort categories in the Stats Dialog's catgory drop-down 
Change-Id: I92016564da48f7f736bebf58fdc0afca5cc1d9ff

Former-commit-id: fdd5e903c6 [formerly b48e70fff4] [formerly c77602652e [formerly 1d9c456b697a79f6093550a26cb3d2d4f972548d]]
Former-commit-id: c77602652e
Former-commit-id: 3071eb8456
 2013-02-26 14:03:55 -06:00
Nate Jensen
b173d34ba9 Merge "Issue #1668 add gsd pattern to allow for their plugins to be deployed" into development 
Former-commit-id: 15c4c4dfa0 [formerly b062299796] [formerly 36d4eff2c6 [formerly 03591924b4efdc13f1cc01182d39e280309cf381]]
Former-commit-id: 36d4eff2c6
Former-commit-id: 5c33098315
 2013-02-26 13:53:40 -06:00
Nate Jensen
2b81ce6028 Merge "Issue #1506 fix deadlock and edit areas showing up from query" into development 
Former-commit-id: f5ebeb1330 [formerly 1e50b3a0e8] [formerly 4e60fa682d [formerly 698d1d88b5c67498046dcec558361797a01b07f5]]
Former-commit-id: 4e60fa682d
Former-commit-id: e1660e51f8
 2013-02-26 13:46:30 -06:00
Dustin Johnson
8e4a990d1a Merge "Issue #1592 Don't submit adhoc query when X button clicked" into development 
Former-commit-id: 074fb0aa64 [formerly 47cb278c01] [formerly d31392d740 [formerly bf86849d284696553ed4cbc3f347afe2f791968d]]
Former-commit-id: d31392d740
Former-commit-id: a7d4b23597
 2013-02-26 13:41:46 -06:00
Dustin Johnson
4153bdd79e Merge "Issue #1643 Add NCF bandwidth manager router" into development 
Former-commit-id: 50b412b34e [formerly 42402c5d73] [formerly fb235e3f43 [formerly e2bb08df9a9aa2ac143e0f7fc82b911f72b4b87c]]
Former-commit-id: fb235e3f43
Former-commit-id: a648519673
 2013-02-26 13:41:36 -06:00
Dustin Johnson
bb5f6cc568 Merge "Issue #1588 - Fix match any/all in data browser dialog" into development 
Former-commit-id: 3dd36d29cf [formerly fb38cceecd] [formerly 76738dbf7d [formerly 00e1133e53664a0b8a22a17ca5880736a0f93502]]
Former-commit-id: 76738dbf7d
Former-commit-id: b77ebdc924
 2013-02-26 13:37:14 -06:00
Matt Nash
32096feba8 Issue #1668 add gsd pattern to allow for their plugins to be deployed 
Change-Id: Icbabbdd188557d8f6143e026e4165fc12a51a0d6

Former-commit-id: 41bbd4cf2d [formerly a2fb0db684] [formerly 051b36ad73 [formerly 41c12ff165a6f90edc1cd78aed0ae0053d137bb2]]
Former-commit-id: 051b36ad73
Former-commit-id: b1fe380c44
 2013-02-26 13:29:04 -06:00
Matt Nash
daea84a1e8 Issue #1506 fix deadlock and edit areas showing up from query 
Change-Id: I1a8f8adbb4a6e737c06a6c906cd4db0926254b49

Former-commit-id: 4be89bdd43 [formerly c728f72ea3] [formerly b749edca54 [formerly 5fd67088da350141cc97d90346272843dfc7ff5d]]
Former-commit-id: b749edca54
Former-commit-id: 51e6302178
 2013-02-26 12:20:08 -06:00
Dustin Johnson
898d7500aa Issue #1592 Don't submit adhoc query when X button clicked 
Change-Id: I7a06857fa64a6d54279ec2dca1404062179fe279

Former-commit-id: 604a7c82b2 [formerly 598eb88a04] [formerly c6975aa379 [formerly 9cb2114c239e6782961e8127fe85b10a7ee38f06]]
Former-commit-id: c6975aa379
Former-commit-id: ab1dc2272b
 2013-02-26 12:07:36 -06:00
Dustin Johnson
219e882fc5 Issue #1643 Add NCF bandwidth manager router 
Change-Id: I226bf657469eccc68c29cb21dac10cc10e562ca8

Former-commit-id: ebf02481f0 [formerly d58d28c636] [formerly 722e41b8b0 [formerly 2b52368c81272df18f3af1334057295d11bb4b52]]
Former-commit-id: 722e41b8b0
Former-commit-id: cf86c92fad
 2013-02-26 11:32:03 -06:00
Steve Harris
41e1594be7 Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development 
Former-commit-id: 7ed1eacb6b [formerly 9bcabe2c5d] [formerly 098b1e1579 [formerly 16bc4b8c4e0261039a6c689afb4220f2ca6d904a]]
Former-commit-id: 098b1e1579
Former-commit-id: 57440abebb
 2013-02-25 20:41:26 -06:00
Richard Peter
56771955b4 Merge "Issue #1659 Stop derived parameters from sending empty requests for cached times" into development 
Former-commit-id: 2553955249 [formerly be9370576a] [formerly 1669945cdb [formerly 53850dcdaf54d9ef74bb08cca5b966c448cc054e]]
Former-commit-id: 1669945cdb
Former-commit-id: aa5f3c80a0
 2013-02-25 17:47:14 -06:00
Richard Peter
25909b2ee1 Merge "Issue #1659 Add PDOs to D2DGridResource in constructor to avoid duplicate data requests." into development 
Former-commit-id: af33dd1743 [formerly b98bdb3d81] [formerly 3b718bea52 [formerly bedfb6a21680961421b42bcbcec470e41bb9523d]]
Former-commit-id: 3b718bea52
Former-commit-id: c21a1e9f61
 2013-02-25 17:46:26 -06:00
Lee Venable
444a1f5d47 Merge "Issue #1625 Updated addOrRemoveCounty method." into development 
Former-commit-id: e54eb4ab55 [formerly e024e4e087] [formerly 7f769af427 [formerly cda14b7c5e6563a9165fa734f35766816bccccf1]]
Former-commit-id: 7f769af427
Former-commit-id: 0125935a7f
 2013-02-25 17:25:56 -06:00
Jonathan Sanchez
c861c71ae6 Issue #1625 Updated addOrRemoveCounty method. 
Former-commit-id: f59a08963c [formerly cd6dd3c178] [formerly 8c2c7c97f7 [formerly 18760c0895c1776dd0448b0bb699ab5506c45511]]
Former-commit-id: 8c2c7c97f7
Former-commit-id: d4f4832d1a
 2013-02-25 17:15:09 -06:00
Ben Steffensmeier
9ec0008743 Issue #1659 Stop derived parameters from sending empty requests for cached times 
Former-commit-id: ff232b87b4 [formerly 71652af086] [formerly 9edeadc966 [formerly 9605118022d378eb35c38d784729410d160d46df]]
Former-commit-id: 9edeadc966
Former-commit-id: d6c59cb85a
 2013-02-25 17:08:12 -06:00
Ben Steffensmeier
5e1b9383a5 Issue #1659 Add PDOs to D2DGridResource in constructor to avoid duplicate data requests. 
Former-commit-id: f56b305581 [formerly fd2450c0df] [formerly 2fa5fb488e [formerly 4826ccdd4db42342f913cfc9e9fef6bc276dcea9]]
Former-commit-id: 2fa5fb488e
Former-commit-id: e1e7a12ca2
 2013-02-25 16:58:25 -06:00
Nate Jensen
7201499124 Merge "Issue #1659 Cache station in StationUtils" into development 
Former-commit-id: c7d01eb0c5 [formerly bbbdc17c06] [formerly 66e1411de1 [formerly 70f064bed284629fe521ac8d3596cb8ac798c0c7]]
Former-commit-id: 66e1411de1
Former-commit-id: 135006ff0c
 2013-02-25 16:56:55 -06:00
Ben Steffensmeier
8ebeb61cea Issue #1659 Cache station in StationUtils 
Former-commit-id: 0ff907499c [formerly 842437870e] [formerly 39bf907df7 [formerly 5bd8303893ad59a23571c0564984b21da9ffe785]]
Former-commit-id: 39bf907df7
Former-commit-id: 5be0eab696
 2013-02-25 16:25:55 -06:00
Steve Harris
901cbbf56d Merge branch 'master_13.3.1' into omaha_13.3.1 
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java

Former-commit-id: cd99e680bb [formerly b50e384a0f] [formerly e8135b9c14 [formerly 2506058a672fce230e445bcc5bf8ae2f52df0766]]
Former-commit-id: e8135b9c14
Former-commit-id: 2398ef1e85
 2013-02-25 16:05:22 -06:00
Steve Harris
e46625f8f2 Merge branch 'development' into omaha_13.3.1 
Former-commit-id: 0a4564eb97 [formerly 67f090638f] [formerly 6ec9e73035 [formerly 52683c1ffba08b80b0d1f2b619161e108ca598b8]]
Former-commit-id: 6ec9e73035
Former-commit-id: 0051276ad1
 2013-02-25 15:58:48 -06:00
Steve Harris
988430b44d 13.3.1-3 baseline 
Merge branch 'master_13.3.1' of ../ss_build_transfer_copy into master_13.3.1

conflicts resolved by 'theirs' strategy (all of 13.3.1-10)

Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Former-commit-id: 07167ec04f [formerly cf951785c8] [formerly db761c0f19 [formerly 8c1e3bc2413a6e1e6644f8ba8812edf591557f29]]
Former-commit-id: db761c0f19
Former-commit-id: 62e15dacdb
 2013-02-25 15:54:24 -06:00
Mike Duff
dccb6b94b9 Issue #1588 - Fix match any/all in data browser dialog 
Change-Id: I30491d170611f3eec44adcf8b2bd99a445c09a49

Former-commit-id: 0d2c817680 [formerly d00a790d7b] [formerly 086d24acc8 [formerly b9945e70a6b96a2f4b1c24b2308bb424e4cd7ee5]]
Former-commit-id: 086d24acc8
Former-commit-id: 1365596d4d
 2013-02-25 15:53:55 -06:00
Bryan Kowal
f8c920c6cd Issue #1634 - fix EDEX debug with YAJSW Wrapper 
Change-Id: I7c626e2ff94cfc1c3b71dfe2f22dd69785bb2c96

Former-commit-id: 4d160993fb [formerly b05073fbe3] [formerly 0d2262c0bf [formerly f2d20ea72262c5f6e7c35796606cbd4a093cece6]]
Former-commit-id: 0d2262c0bf
Former-commit-id: 36a887416f
 2013-02-25 11:30:13 -06:00
Dustin Johnson
b702146272 Merge "Issue #1620 - Fix set clean issue with job loader." into development 
Former-commit-id: 79718b6a9c [formerly 83a915210d] [formerly eff20112d2 [formerly a6bcea8679319fc49f59310b6731e23a00fb8554]]
Former-commit-id: eff20112d2
Former-commit-id: 1255b87e2e
 2013-02-25 09:43:19 -06:00
Nate Jensen
3a66566610 Merge "Issue #1617 fixed vb sounding point selection for points which contain the word Point" into development 
Former-commit-id: 5d7edbc0c1 [formerly b514792bbc] [formerly 5d828d4d62 [formerly 1fec56c55d81b35df45c2266fc234747df3791df]]
Former-commit-id: 5d828d4d62
Former-commit-id: cb37bab362
 2013-02-25 09:31:55 -06:00
Nate Jensen
530d3bfa00 Merge "Issue #1628 lower Xmx on windows in awips.product." into development 
Former-commit-id: ae20ee7665 [formerly c1becf797a] [formerly 545caf22fb [formerly 8525b4ac1db570160253cf7bb180914967e0b647]]
Former-commit-id: 545caf22fb
Former-commit-id: 87a745eb2f
 2013-02-25 09:31:20 -06:00
Mike Duff
01ef273417 Issue #1552 - Implement FFMP Data Access 
Peer review comments
Change-Id: Ibf11c96248972a86a6a0d779ba482cd133125b55

Former-commit-id: 8a8e8f7a73 [formerly 8bddd467b1] [formerly 81649d346a [formerly 544c90e8a0b5aba5470e60beac18d86d972c05cd]]
Former-commit-id: 81649d346a
Former-commit-id: b1a549a99f
 2013-02-25 09:29:16 -06:00
Steve Harris
05eb25f124 13.3.1-3 baseline 
Former-commit-id: a55f438dd8 [formerly 6572452887] [formerly 8a64f142e5 [formerly dc9e245f83eb0136157f8ca71f80f7fb9eb04796]]
Former-commit-id: 8a64f142e5
Former-commit-id: 8d741715e3
 2013-02-25 10:24:53 -05:00
Steve Harris
370ed98038 13.3.1-2 baseline 
Former-commit-id: 3e60b23072 [formerly df6d6f598e] [formerly 3d115ed3be [formerly 09fb11f28bef2c3cd8fb3bfe1b2fe88f3b30af6e]]
Former-commit-id: 3d115ed3be
Former-commit-id: e8a51dc780
 2013-02-25 10:18:36 -05:00
Mike Duff
9e177f44cd Issue #1620 - Fix set clean issue with job loader. 
Change-Id: I1cf1e109ae3964ef95ebb9a2582622c31e271028

Former-commit-id: bfc1e66dfb [formerly af8b97cd3c] [formerly 3340a9ddd8 [formerly c436049a244e3a7c0c7fb629673d8f15c46c72a8]]
Former-commit-id: 3340a9ddd8
Former-commit-id: c904dc42ef
 2013-02-24 19:13:57 -06:00
Roger Ferrel
186c71e5ac Issue #1442 Fix null pointer exception in DecisonTree's searchTree 
Change-Id: I5bf36da8aa6e8ef2a2efee08e01e232bff8eb7ef

Former-commit-id: 07a103c3bb [formerly 152715160e] [formerly 09b5996dac [formerly 9ef63af71325c5b6694f41c78506d618078e0b9e]]
Former-commit-id: 09b5996dac
Former-commit-id: fd95a99596
 2013-02-22 12:49:53 -06:00
Dustin Johnson
a1df296e80 Issue #1543 Make DAOs public 
Change-Id: I7002ff6db38e7daa9453f11e46a2e5adbb919f7a

Former-commit-id: d4186178af [formerly 06b7697553] [formerly 0743782772 [formerly a4bb7967b92977d21c9bea34fc5adc883ceb68c1]]
Former-commit-id: 0743782772
Former-commit-id: 4e87912a9c
 2013-02-22 12:22:43 -06:00
Bryan Kowal
53b9e69868 Issue #1634 - force added wrapper jars in bin directory 
Change-Id: If9bee93b5893fb8ecc244045fa0672d3f5b92f48

Former-commit-id: 4cd5453e0a [formerly 7c62991edf] [formerly d5c8b82941 [formerly 4f07f09e39949f6323dac4688913e02672a17fd8]]
Former-commit-id: d5c8b82941
Former-commit-id: 5a5914c010
 2013-02-22 09:28:37 -06:00
Ben Steffensmeier
2892e64677 Issue #1617 fixed vb sounding point selection for points which contain the word Point 
Former-commit-id: be95659d4a [formerly 1d8ad288b4] [formerly 5701309bcb [formerly d2aa45b1fb765ae3f24d96b39b789195d5c607ed]]
Former-commit-id: 5701309bcb
Former-commit-id: 7c0f1bf788
 2013-02-21 16:28:41 -06:00
Steve Harris
4f155a183a 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: 64744fdb19 [formerly a0573644c4] [formerly 2641d578e2 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]
Former-commit-id: 2641d578e2
Former-commit-id: 33dd2589f1
 2013-02-21 15:41:39 -06:00
Ben Steffensmeier
dd2d3da9bb Issue #1628 lower Xmx on windows in awips.product. 
Former-commit-id: 86f30a647d [formerly 62eaf8e947] [formerly 0bb2c03a83 [formerly 39d24c906c0aae925b9c472569c1d9e99dbd6021]]
Former-commit-id: 0bb2c03a83
Former-commit-id: 4209a3cfb1
 2013-02-21 14:30:41 -06:00
Bryan Kowal
b2a0a7c148 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: 519ce2c0fb [formerly a8fb04f41c] [formerly 803397c7c7 [formerly a5d554c271b87fa6d6b264ebb677802b58ebb763]]
Former-commit-id: 803397c7c7
Former-commit-id: 450e8e7a4c
 2013-02-21 13:55:28 -06:00
Nate Jensen
533deac8d0 Merge "Issue #1628 clean up Inflaters used by HttpClient." into development 
Former-commit-id: b2f7cbcbe3 [formerly 7dbeeb2684] [formerly c6896b5676 [formerly 2a67f7f061b0be3740846a2b5cc2dc50403c05cf]]
Former-commit-id: c6896b5676
Former-commit-id: 4f4932b014
 2013-02-21 11:47:00 -06:00
Nate Jensen
6f9d3f55e5 Merge "Issue #1635 Second Guidance source verification, general cleanup" into development 
Former-commit-id: 033b9e3852 [formerly a9c4e54287] [formerly 73f53bd513 [formerly 25ecfc3e6199294275abc8547c482388c55be724]]
Former-commit-id: 73f53bd513
Former-commit-id: d7a57d2b34
 2013-02-21 11:41:52 -06:00
Ron Anderson
e61af5611a Merge "Issue #1506 fix for GFE evaluateRefSet() for non-queries" into development 
Former-commit-id: e6ec21bd53 [formerly 03c48b2f7a] [formerly 297c132c49 [formerly 4397b9cad2c75e5d4fa3a1933394fadc8460153a]]
Former-commit-id: 297c132c49
Former-commit-id: ff2370221a
 2013-02-21 09:10:07 -06:00
Matt Nash
84f3da4828 Issue #1506 fix for GFE evaluateRefSet() for non-queries 
Change-Id: I342ce5c5e0449b7f5f4f81865705ed55aff3c5a7

Former-commit-id: 6f9621adb2 [formerly 2001d916ac] [formerly 492df9c238 [formerly 2f9911c6e28fd3b5617353ec8de80c16f812c508]]
Former-commit-id: 492df9c238
Former-commit-id: 5d6a7a6140
 2013-02-21 09:01:33 -06:00
Steve Harris
0569ff413d 13.3.1-1 baseline 
Former-commit-id: 96768407a5 [formerly 0563d7ac18] [formerly cabc8cf8b4 [formerly 841b0cf38549666c4f65f0d0cff3b92d76c9e795]]
Former-commit-id: cabc8cf8b4
Former-commit-id: 92e4c7ba19
 2013-02-21 09:36:59 -05:00
Steve Harris
87bd35250c 13.2.1-8 baseline 
Merge commit '1da0393' into master_13.3.1

Conflicts:
	cave/com.raytheon.uf.viz.collaboration.pointdata/com.raytheon.uf.viz.collaboration.pointdata.ecl
	cave/com.raytheon.uf.viz.collaboration.product.feature/com.raytheon.uf.viz.collaboration.product.feature.ecl
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogZoneTableDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowISCGridsAction.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProductScriptsDialog.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/util/AlarmAlertFunctions.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/spatial/GribSpatialCache.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/build.properties
	edexOsgi/com.raytheon.uf.common.datadelivery.retrieval/build.properties
	edexOsgi/com.raytheon.uf.edex.dat.utils/src/com/raytheon/uf/edex/dat/utils/FreezingLevel.java
	ncep/gov.noaa.nws.ncep.edex.plugin.convsigmet/utility/edex_static/base/purge/convsigmetPurgeRules.xml
	rpms/awips2.core/Installer.ldm/component.spec

Former-commit-id: f5bd250026 [formerly 7f2b4a8092] [formerly 2f7bf90856 [formerly bfd58746491d6fcefc2f0e7d33907bf095f5b818]]
Former-commit-id: 2f7bf90856
Former-commit-id: a723531b31
 2013-02-21 09:25:27 -05:00
Lee Venable
997cebb2df Merge "Issue #1609 update style rules for msl-P contours" into development 
Former-commit-id: b82961dda2 [formerly 46aa0595d8] [formerly 7d2452e0ef [formerly cb89924d5a8a751bd96fdfa3e2ccbed74c3ba815]]
Former-commit-id: 7d2452e0ef
Former-commit-id: fbaf19e184
 2013-02-20 18:03:30 -06:00
Ben Steffensmeier
894c7e7e62 Issue #1609 update style rules for msl-P contours 
Former-commit-id: 6bf304ab80 [formerly e7f73db73c] [formerly f029f74a4f [formerly 2137a2aae531d5550a59d7c5afd77a8d1fc28bc8]]
Former-commit-id: f029f74a4f
Former-commit-id: 5b9e13aa3d
 2013-02-20 17:27:16 -06:00
Steve Harris
e4435815c9 13.3.1-1 baseline 
Former-commit-id: 8ae397085e [formerly 71e8990021] [formerly d2a654625f [formerly 34684c71436ce4c395ea523eb34ded6792476816]]
Former-commit-id: d2a654625f
Former-commit-id: 46d28be4a4
 2013-02-20 16:19:40 -06:00
Dustin Johnson
f552967bf3 Merge "Issue #1543 Use separate RetrievalPlan configurations for NCF and WFO - Change new registry modes to explicitly list includes/excludes. - Add separate bandwidth manager creation capabilities for NCF and WFO. - Add deltaScript to add a "route" slot to subscriptions. - Remove unnecessary schemas from Spring files." into development 
Former-commit-id: b6602f9468 [formerly a9e976eed8] [formerly cb1380af90 [formerly 1d4453fdcdfd5c34d943f1a595a31820fedd133c]]
Former-commit-id: cb1380af90
Former-commit-id: 5031ae4d66
 2013-02-20 16:17:20 -06:00