Context Navigation

objectbatch.py

Timestamp:

Dec 10, 2012, 4:35:46 PM (14 years ago)

Author:

watersc1

Message:

Merge from trunk

Location:

branches/czw_branch/20120906

Files:

Property svn:mergeinfo changed

/branches/eam_branches/ipp-20120905 (added)	merged: 34407-34409,34415-34417,34423-34428,34451,34466-34469,34490,34494-34495,34508,34517-34526,34529,34543,34546-34558,34561-34563,34565-34575,34609-34610,34616-34619,34652-34655,34681-34686,34689-34694,34697-34699,34718,34727-34730,34732,34735,34747
/trunk (added)	merged: 34418-34422,34429-34441,34443-34445,34447-34448,34452,34459-34465,34472-34486,34488,34492-34493,34496-34507,34509,34511-34515,34527-34528,34530,34532,34534,34536,34538,34540-34542,34544-34545,34559-34560,34564,34576-34599,34608,34611,34613,34615,34620-34621,34629-34631,34633-34635,34638-34642,34644-34650,34657-34658,34660-34661,34664,34668,34671-34672,34675-34676,34687-34688,34695-34696,34700-34704,34708,34712,34715-34717,34719-34721,34723-34724,34726,34731,34733-34734,34737-34738,34741,34743-34744,34748-34750,34753-34754,34757,34759-34762,34764,34766,34768-34771,34773-34777,34779,34782

r34772	r34786
134	134	," + filter[1] + "80pct = MAG_80/1000 \
135	135	," + filter[1] + "Flags = (0x7fff & FLAGS) \| ((FLAGS >> 11) & 0x2000) \
136		," + filter[1] + "StackDetectID = STACK_DETECT_ID ~~+ " + str(filterID)~~
	136	," + filter[1] + "StackDetectID = STACK_DETECT_ID"
137	137
138	138	#self.logger.info(sql)

Note: See TracChangeset for help on using the changeset viewer.