labofsahil/github-event-dataset-2012 huggingface dataset:
- Update to 4.3.2
- while here use datadir in plist

PR:	ports/166903
Submitted by:	maintainer, bsdkaffee@gmail.com
- Update to 5.0.23
- while here use datadir in plist

PR:     ports/166904
Submitted by:   maintainer, bsdkaffee@gmail.com
- drop option WITH_RC_NG
Update to 0.9.4

Approved by:	crees (mentor)
- Fix build post mail/mutt-devel upgrade. The patch-nbsp from master port
  now conflicts with our own patch-zh-mutt, so have to move the patch
  into post-patch section
Fix jpgraph dependency testing
- Update to 3.0.0 [1]
- Unbreak port on FreeBSD 9 [1]
- Minor re-arrangement of Makefile for clarity [2]

PR:		ports/166754 [1]
Submitted by:	Mikhail T <m.tsatsenko@gmail.com> (maintainer) [1]
Reviewed by:	scheidell (me) [2]
- Update to official release 3.0.7
- Update MASTER_SITES (remove unofficial ircd-ratbox.org)
- Unbreak cross compiles
- Fix error handling with GNUTLS
- Update sqllite3 code
- Remove buggy sigio code.

PR:		ports/166914
Submitted by:	moggie <moggie@elasticmind.net> (maintainer)
Update to 0.41
Fix a couple of issues:
 - Make compile with old and new openssl
 - Do not try to call git to get the version number
 - Fix compile on FreeBSD 8.1
 - Change maintainer email address

PR:		ports/165775
Submitted by:	bz
Update to version 0.19

Changes: No changes
Document phpmyfaq -- Remote PHP Code Execution Vulnerability
Update to 2.7.5

Security:	http://www.vuxml.org/freebsd/c80a3d93-8632-11e1-a374-14dae9ebcf89.html
- Update to v0.15
- Update to v0.008
- Pet portlint(1)
- Update to version 1.6.1
- Add missing build/lib deps
- Add option to build doxygen documentation (default off)
Update to 3.11.0
Change to my FreeBSD.org email address.

Approved by:	crees (mentor)
Fix startup script issue with a wrapper script obtained from www/gatling.

This wrapper tries to emulate part of the functionality usually supplied by
software like daemontools or runit. It is used to start socat which does not
daemonize itself and logs to stdout/stderr. It redirects stdout and stderr to
logger(1) via a fifo.

While here also remove if-statement around PORTDOCS based on NOPORTDOCS since
it's redundant with checks in ports/Mk/bsd.ports.mk.

PR:		166947
Submitted by:	Mark Felder <feld@feld.me>
Add new port: math/py-fiat

The FInite element Automatic Tabulator FIAT supports generation of arbitrary
order instances of the Lagrange elements on lines, triangles, and tetrahedra.

WWW:	https://launchpad.net/fiat

PR:	ports/166910
Submitted by:	jwbacon@tds.net
Octopress init
Site updated at 2012-12-10 22:51:25 UTC
bug correct, hid list in custom selection
Imported Upstream version 0.6.20
Merge tag 'upstream/0.6.20'

Upstream version 0.6.20

# gpg: Unterschrift vom Mo 24 Sep 2012 16:42:33 CEST mittels RSA-Schlüssel ID 9B1F5883
# gpg: Korrekte Unterschrift von "Markus Frosch <markus@lazyfrosch.de>"
# gpg:                     alias "Markus Frosch (NETWAYS) <markus.frosch@netways.de>"
Add script for recursively running php lint on a directory. Thanks to http://joshtronic.com/post/17776727071/recursive-php-lint-inator
blaarg
Merge branch 'master' of https://github.com/lcr2131/HardwareFinal
delete the libs/quicktime/include/Icons.h
add libs/quicktime/include/Icons.h again
add Spring init-method for init of ProvidersDefinition
Fix ancillary set, bump to v2.3.2
Rains bullets.
add latest lex-chat.lib
build: Fix ./configure --with-febootstrap-yum-config option.

This fixes commit bfddae7ceefa4a419ff56848122a46c71c4d6a3c.

Also tested that all variants actually work.
Revert "(FBACores CPS1/CPS2) Reduce filesize" - hopefully
fixes controls

This reverts commit 64b0e1b3bdbcc76d5d90d006050bcd13f1bef89e.
FACES-1449
Queued exceptions not reported when JSF lifecycle is executed in ACTION_PHASE, EVENT_PHASE, or RESOURCE_PHASE of the portlet lifecycle
Fixed a bug where feeds without a favicon caused a serialization error
in the Favicon class (this was fixed by forcing Feeds to have a favicon
by default)
spacing issue
Added skeleton classes for mark as read requests and queueing system
Added missing email error messages
Merge pull request #2 from loonies/issue/missing-error-messages

Added missing email error messages
shell: cleanup

Signed-off-by: Fudong Bai <fudongbai@gmail.com>
vim: add vim cheat sheet

downloaded from:
http://www.viemu.com/vi-vim-cheat-sheet.gif

Signed-off-by: Fudong Bai <fudongbai@gmail.com>
dependency to zenity added
commiting acceptance journeys module for code review and maybe help
vc fixed
Update lizard-worker to 0.9.
export run workflow template 4
adding bootstrap JS file
added comma that was breaking firefox
Pyflakes trocado por Syntastic. README para ser atualizado
[maven-release-plugin] prepare release ProvToolbox-0.0.1
Updated places plugin configuration
Update gemfile
Remove lolcommits
Made rules configurable
Added logging utilities and calls
adding git repository
[UBSan] Add support for building ubsan runtime library on Linux with 'make'. Compiler-rt part.

git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@168038 91177308-0d34-0410-b5e6-96231b3b80d8
[ASan] Poison the leftmost shadow byte with a special value so that we can find
the beginning of the fake frame when reporting an use-after-return error.
Fixes http://code.google.com/p/address-sanitizer/issues/detail?id=126



git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@168040 91177308-0d34-0410-b5e6-96231b3b80d8
[ASan] Minor fix: return to the last byte of the fake stack if we've raced by.


git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@168043 91177308-0d34-0410-b5e6-96231b3b80d8
[ASan] Revert r168040 and r168043 and take a cleaner solution suggested by Kostya: return the known frame name for fake stack instead of looking it up.


git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@168046 91177308-0d34-0410-b5e6-96231b3b80d8
tsan: eevn better handling of signals
add interceptor for poll()
in addition process signals in every atomic op
in addition process signals in blocking libc functions


git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@168050 91177308-0d34-0410-b5e6-96231b3b80d8
tsan: switch to 4 shadow cells by default (since that's what we use everywhere now)


git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@168059 91177308-0d34-0410-b5e6-96231b3b80d8
tsan: remove unused parameter


git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@168060 91177308-0d34-0410-b5e6-96231b3b80d8
[TSan] use llvm-symbolizer to run tsan tests

git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@168146 91177308-0d34-0410-b5e6-96231b3b80d8
Put all Element class methods into class and wrote a test for PageLayout#elements :all feature.
fixed faulty reformat
counts empty emails
rss feed to app
rss builder added
Site Title and DEscription variables
Rack Flash
Flash Success Added
View displaying the list of questions under a category is done
find_python: monkey-patch subprocess from py2x w/ check_output
hep-system: drop full-path in compiler name for building CMTCFG quadruplet
hep-base: define xyz_HOME variable even for local installation + more robust extra_paths handling
cmake/xrootd: more leniant detection of optional binaries
root: correctly and consistently find_program from path_list via --with-root-sys if any
scripts: more robust handling of origin-rw
iTunes and QuickTime one-time defaults.
Delete the old twitter simple client
splitted BlogsModel-getOverview to getOverview and getOverviewByTag
refactored medias to have a model, that handles querying of files, creating and destroying
Update package.json license pointer - good catch @tarvaina!
Changed links to fix issue #4
features hasta ahora pasan
helping mario out
Adding class for magentometer
Working on computing heading from axis
Adding compass visualization to display
Adding checks on heading validity
Add readme file for when this will be a WordPress plugin
Stabilising 0.5, separate package for Razor
Fixed URL-decoding in FormDeserializer
Merge branch 'master' of github.com:markrendle/Simple.Web
Last part of the dead and revive system. when a player dies he will be ported to the nearest gravyard on map. to get revived he has to run to the place he has died
クラウド研究会　2012/05/08 @IBM  講演資料
test
modify edit.java
Make sure `query_delete_expired` doesn't delete session cookies (#154)
updated port
updated readme
Add tracks from library view getting a list and then add all together.
Slowly, but starts to work properly. =)
Fix test_pickle test.  Remove lots of the text to make the comparison easier, and also update for a recent fix to the legend.
Merge pull request #1255 from mdboom/fix-tests

Fix test_pickle test.
mod_mruby.c, ap_mrb_request.c and ap_mrb_request.h modified

content_type, handler add set function
Merge pull request #7 from tsuzakiyo/master

mod_mruby.c, ap_mrb_request.c and ap_mrb_request.h modified
adding BSD license
using open source images
updating PT font license
pixmap update
Working round python3 / python2 installations
BF - python 3 compatibility fixes
properly initialize struct members
added add_server() function to ruby module
support "default_timeout" option in config.db to specify duration time
Merge pull request #23 from kenhys/default-timeout

	support "default_timeout" option in config.db to specify duration time
Initial directory re-arrangement for storage.
Add Apache License 2.0 boilerplate.
Fileset 2
Tuning, use mousedown instead of onclick
allocated results chart
added borders, sample data to results chart
outfitter stuffs
things are a little different now
moved from epydoc to sphinx
object model is getting fleshed out
Working install.
Might have forgotten to actually add the files.
Append a example link
2.2.Beta1

Change-Id: Ibe368df109932960811fccfaedf74b84566ecdbb
This is how we actually use Permissions and Commands.
...maybe more like that.
Jie's fixed to multiple emails problem
Added readme
Merge branch 'master' of github.com:micke239/spaceshooter
updated page heading
fixed database conn
editor_wrapping not only for git
Fixed removeAllChildrenByType() which wasn't working
Updated docs
removed a bunch of warnings
+ explode_twice.inc as hidden file
moved explode 2x to feeds_tamper
Added Rubberband box; not zooming correctly; incomplete
Added rubberband box
[Common] Fixed wrong java 7 dependency
[Client] Improved logging output
[Common] Removed pointless log output
Add rank condition
[Client] Added some logging output
[Client] Removed typo at showing health status
Merge branch 'master' of github.com:Illarion-eV/Illarion-Java
Deleted the obsolete application.php file
Visual Frameworks.
Add Recommended solution for Problem1
Added select, reject, flatten, and join array methods
Merge pull request #6 from neilco/more-array-ops

Added select, reject, flatten, and join array methods
bumped version of TinasoftPytextminer
Update changelog with libspotify 12 related changes
should call setDesignResolutionSize in AppDelegate
updateTransform() performance fix.
Deepan/Alex: Fixing build
Deepan|Fixed ivr channel mapping to enable multiple phone numbers associated with the same channel
Merge branch 'master' of github-dell:motech/GHANA-National
Luka, Preethi | #0000 | Cannot delay pills - cut the 'at' the end
Katta|000|deleting some thread dumps
test to change the type of file
correct typo in docs test,stack to test.stack
correct to create function change , to ;
Merge branch 'master' of https://github.com/neillturner/knife-cfn
Updated gemspec and gem for chef version change from .10 to 10.
Re-enable elf-hack now that it works with b2g.
Merge pull request #18 from cgjones/enable-elf-hack

(DO NOT MERGE UNTIL 716295 REACHES M-C) Re-enable elf-hack now that it works with b2g.
ANT # added ant-contrib-1.0b3.jar to exemplar Java SE build.xml
added some jars to repo-wide lib
JPQL # 000 # 01 : a ray of hope: maybe I can unjar the Orders-ejb.jar, stuff the persistence.xml in its META-INF, re-jar it and then call Test (I did it manually) - the classes still need to be enumerated though
time measuring in bash
generalised file path
add 6.TDD-Intro.key + 4 mov files
Running tests. Added ex.txt with data
added comments and deleted footer and header
new ontocat version 0.9.9.1
ontocat plugin for OC
Logo for OmicsConect
updates from blessed
Merge branch 'master' of github.com:molgenis/molgenis_apps
Merge branch 'master' of github.com:molgenis/molgenis_apps
Merge branch 'master' of github.com:molgenis/molgenis_apps
created pubmed lookup using efetch ncbi api
updated GWAS model
Merge branch 'master' of https://github.com/rhastings/molgenis_apps
Added first version of FilterableProtocolTable (which filters all
protocolApplication for one Protocol using ObservedValue to store the
values).
group templates by account in manage ui
suppress some spaces in front of links
style gui elements
another image path attempt
cloudbees mongodb credentials
change nginx-special-1.3.5 to nginx-special-1.3.6
agora conecta! PORRA!
add cobrand module and templates for see something say something
Use right parameter system for right emails.
sort out location of user-meta
user-meta position for ie6
bromley -> barnet
do not load barnet css for mobile
mobile display fixes
Top left corner given in WMTS capabilities file appears to be about (78,77)m out of where it should be (in order to get the right lat/lon when I click the map in OpenLayers anyway).
map_pins function is same for everyone currently.
Add server side handling of Swiss co-ordinates and tile clicks.
Add ToS. Add favicon
ajout d'un screenshot + modifications du css (le popup) ainsi que modifs dans le cnc.js
Tentando via netbeans um push..
Nueva version!
Store para servicios que persistan las respuestas
Cambio de nimbre de los recursos para hacer mas facil la visualizacion
en tabs de un editor
Nuevo metodo en service para extender los models con las respuestas
Y algunos metodos utiles por ahi..
use ABS in MapActivitys
Turned main into a text benchmark and fixed lots of text errors
컬럼 _ 삭제 후 다음 문자열 대문자로 치환
Added some previously unpublished posts
Totally new design
Changed page size to 5
New post: Total redesign
Update due to movet to DFROBOT Pirate platform
Data structure looks different
Shorten cache time for ontologies
コマンドラインでqt固有のオプションを指定できる様に修正
ウィンドウ操作に関する修正

・KDE上のoxygenスタイルでシステム側でウィンドウドラッグ移動を有効にしてる場合、
  ミュート領域でドラッグ移動した時もその後ミュートされる問題修正
Ditch latest gem thing and use -i matchers instead
Added template for web db settings
Work on web front end
too many mixed changes! Here is a short list:

add more instructions
enable sandbox mode
replace text images with actual text
Stop hard-wrapping.
Set redir file
Renamed powershell profile
a fixed dimension for canvas
Modified movement to work on second derirative (acceleration) and implemented friction on tiles.
finished first cut of the user modek
Fixing date range for calendar in home page
add math stuff
moving integration tests to simply
moved mailer tests related to buyer to simply
copy editing
Moved python files into once place so they can import correctly,
moved xbee package directly into the repo
Merge branch 'master' of github.com:nipunn1313/Virtual-RC
update README
update test
Version bump to 2.1.3
still getting errors
Regenerate gemspec for version 2.1.3
modification of ui part, almost ready for the study
Commented out the autofs stuff for now, as Brandt is working on it.
References #144 - Added sample upload file, a migration to add the `image_value` column type, and other supporting things to allow users to create `image` column types.
Added `carrierwave` gem.
References #144 - Uploads are now working to local file system via carrierwave.
References #144 - Added RMagick for image processing.
References #144 - Added gitignore line to ignore carrierwave uploads.
References #144 - Added display of thumbnail instead of full size image in the section show view.
References #144 - Added link to image displays so that if you click on an image it will load the full-size version.
Updated the ImageUploader to remove the comments that don't apply to my specific deploy setup and limit uploads to image types.
References #144 - Got a scenario working that confirms that uploads work.
References #144 - Implemented a scenario that confirms that non-image file types are disallowed.
References #144 - Added package `libmagickwand-dev` for ImageMagick / RMagick support. This is used as part of the image processing and resizing code.
References #144 - Removed assets and modified the stylesheets such that images will have a fixed with and height, regardless of what their aspect ratio is, or their actual image size.
Rebuilt assets for deploy to staging.
References #144 - Changed the method used to generate thumbs so that images fill and are cropped to the dimensions specified. Also, reworked the CSS so that the images won't be stretched.
References #144 - Added a couple of extra steps to the deploy setup for two reasons. First, because deploying to staging would wipe out the images uploaded because the `uploads` folder was getting deleted on deploy. Second, the "upload" folder, since it's now going to be in the "shared" folder, needed to be setup during the `cap [env] deploy:setup step`.
References #144 - Experimenting with getting S3QL working.
References #144 - Split out dependencies into what I really think I need so that I can remove the ones that maybe I don't need.
References #144 - Many changes related to automating the install and setup of S3QL.
- Cleaned up the bootstrap script notes at the end of the script and removed the reboot step as I want the reboot to be manual.
- Took out the `regenerate_config` step from the `nginx:install` capistrano task. It was redundant.
- Added what I hope will be a successful s3ql capistrano recipe for install and config generation.
- Added a template for both the auto-mounting script for S3 buckets (http://askubuntu.com/questions/20574/how-to-create-a-s3ql-file-system-and-mount-it-automatically-on-boot) and for the S3QL authentication info.
- Cleaned up the formatting of the "ASSUMPTIONS" section of the capistrano deploy script.
- Added a step to trigger the `s3ql:install` task during `deploy:install`
- Added a package dependency to the instal list in the `deploy:install_app_package_dependencies` task
- Cleaned up the text that reminds you what to edit ever the app is cold deployed.
- Added symlink creation to point from the 'public/uploads' folder to the mount point in the production environment.
Corrected a small typo in the bootstrap script.
More obsession over word choice.
Use version 1.1 for everything, especially search
Update requests version and Twython version
Fixes #119
Moved around some code, support for removing and updating Profile Banners

Line 213 needs to check for status code as well now because
remove/updating banner does not return content, only status code
Deleting auth stuff, oops
Version bump
Posts with files and params works with requests 0.14.0

#122
Fixes #121
Resolve Merge
Finish second merge of @michaelhelmick's Twython patches
Merged chbrown's patch to use 1.1 for default versioning endpoints; bumped to 2.5.1
Added @chbrown to list of known contributors
requests==0.14.0 requirement

Requests needs to be on 0.14.0, otherwise calls with params and files will not work.
Version number bump, no need for env python line
Fixing up some urls, cleaning up code

* Cleaned up exceptionType into ternary
* getProfileImage is only supported in Twitter API v1
* Updated other media update methods to use 1.1 and pass  dynamic params
Merge pull request #125 from michaelhelmick/patch-1

requests==0.14.0 requirement
Merge pull request #126 from michaelhelmick/patch-2

Version number bump, no need for env python line
Merge pull request #127 from michaelhelmick/fix-legacy-urls

Fixing up some urls, cleaning up code
Version bump
UpdateStatusWithMedia url accounting for API v1

Fixes #130
Update to admin-page-alumni. Upload new SQL.
made user editable, added extension ("Durchwahl")

fixes bug nutztherookie/swp_kp2_2012_gruppe1#87
Change bullets
some js tweaks
Made histogramming with FancyKeyedData work,
fixed histogramlog incorporating the wrong way,
added iterator to histogramlog, however it doesnt just move in one direction during iterating, so it doesnt
plot proper if both positive and negative values.
Fixed negative side of HistogramLog.
basic token access for api-only clients
headers are stored under request.env with underscores
don't check api_token twice
[maven-release-plugin] prepare release robospice-parent-1.3.0.RELEASE2
.
delete sample logs
Merge pull request #5 from odeits/master

Bulk Message Push
[2262][templates] update keywords, notes and extras to new UX/style
Fix viz yml
added instance diagram
Sadly this does not fix the issue.

Revert "Add clearfix class to projects_heading to ensure the UI widgets are clickable"

This reverts commit be630d9be999b241c49d9b572a2fdff345964edf.
provide links to issues/pull requests in 2.12.md
do not cast to LonLat if center is null in Map moveTo
Fix proj4js script.src
tileQueue has nothing to do with numLoadingTiles.

The tileQueue might have entries again after zooming when the previous zoom level hasn't finished loading yet. Removing the check for the tileQueue's length makes layers report loadend correctly again.
Merge pull request #325 from bartvde/foo

do not cast to LonLat if center is null in Map moveTo
Merge pull request #326 from fredj/proj4js-url

Fix proj4js script.src
Merge pull request #322 from ahocevar/322

WMS loadend event does not always fire
Merge branch '2.12'
Merge pull request #329 from bartvde/master

merge 2.12 into master
added bootorder parameter to the openvz manage screen. Closes #83
add forgotten mustache template for adding places
noindex in inner_page
Fix platform_family case statement to not fail chef runs
Use symbols not strings when referencing attributes (food critic)
Don't set attributes when a default will work just fine
Consistent references to file modes
Use platform_family for all platform checks

The current cookbook already uses platform_family, but only in the
attributes file.  It might as well be used everywhere.  This results in
the cookbook now actually supporting Amazon linux (which is already
claimed to support)
Add back support for Fedora
Fix the platform family name for Redhat which should be rhel.  Thanks retr0h
Merge pull request #5 from tas50/COOK-1668

Cook 1668: Correct use of platform_family so the cookbook will run
Front page deleted
<BirdSquare> #NaN: Fixing issue 'FB.getLoginStatus() called before calling FB.init().'
Move collectRenderablesInScene() to RenderHighlighted.h.
More algorithms moved around.
Merge branch 'master' of github.com:orbweaver/DarkRadiant
Add index page for HTTP API
Tweak JSON attachment parsing for API

    * Don't require a content-type, so data:,this is content
      is perfectly allowable. Such content is assumed text/plain
    * Support the charset hint, so
      data:text/plain;charset=iso-8859-1,content here
      will be translated to UTF-8 if the php iconv() function exists.
      Otherwise, content is left intact and assumed by the database to by
      UTF-8 already
Fix API .htaccess file

Before it required an edit for osTicket installations made to a folder other
than the root of a domain or subdomain. Now, the installation path is
autodetected and rewritted.

Also, don't assume that every Apache installation has mod_rewrite support.
Properly represent attachment filename in errors
Put elements of the same type into an array
Add detail documentation for API ticket/create
Add support for the priorityId field in HTTP API
Add more polish to the API docs
Add placeholder for API icon
Fixup attachments based on XML parser changes
Merge branch 'feature/xmlparser-revisited' of git://github.com/protich/osTicket-1.7 into feature/api-docs
Merge pull request #376 from greezybacon/feature/api-docs

Reviewed By: Peter Rotich <peter@osticket.com>
Teasing you…
Génération d'une erreur PHP utilisateur si la requête vers Loggly à rencontrer un problème à la place d'un envoi d-email
webstorm 프로젝트 파일 제외
확장 모듈 업데이트
express 2.5.x의 코드 스타일로 변경
mocha 테스트 케이스 추가
clog 추가
필요없는 테스트 제거
clog 설정
권한 관리자 테스트 추가

유저용 디비상수 추가

테스트할때 디비교체할 수 있도록 변경
authmanager 파일명 교체위해 삭제
authManager 다시 추가
들여쓰기 맞춤
들여쓰기 맞춤
사용자 추가 메서드 작성

페이스북 사용자 추가 유닛테스트 작성
사용자 찾기 추가

페이스북 사용자 찾기 테스트케이스 추가
clog 전역변수로 변경
facebook 인증 추가
twitter 인증 추가
google 인증 추가

timeout문제로 현재 로그인되지 않음
me2day 인증 제거

추후에 everyauth방식으로 추가해야 함
add test parseComment
Com mural.
Issue # 4 - hotfix when deal is not for booking system
my first parsley (defined type)
updated modules within here
Added initial landing page markup
Updated README
Whitespace cleanups
Theme and font-lock cleanups
Refactored mode line customizations into standalone module
Refactored modeline settings to standalone file
余計なwwwを削除
By name parameter tests
Work around player that doesn't have the right registration,
should have done this in populate.
Il semble que j'ai fini l'app de démo
rest server and basic client
rest server and startup script
Merge branch 'master' of github.com:paulscott56/OSCON2012

Conflicts:
	georest.py
	georestclient.php
Working lightbox fotos
hsha server may stop responding and will not close selectors
patch by Viktor Kuzmin; reviewed by Vijay for CASSANDRA-4370
fixes for small-sstable compaction
patch by slebresne; reviewed by jbellis for CASSANDRA-4341

Conflicts:

	src/java/org/apache/cassandra/db/compaction/CompactionTask.java
Merge branch 'cassandra-1.1' into trunk
Check schema before trying to export sstable
patch by Jason Brown; reviewed by jbellis for CASSANDRA-2760
Merge branch 'cassandra-1.1' into trunk
Use correct partitioner when saving + loading caches
patch by jbellis; reviewed by xedin for CASSANDRA-4331
merge from 0.1
CQL3: fix range query containing unqueryed results

patch by slebresne; reviewed by jbellis for CASSANDRA-4372
Revert "merge from 0.1"

This reverts commit 9f867ea4c20b40e2bcd07fb43dc888bd3601474a, reversing
changes made to 681e2dea7679e0008cf149afc2b01f4b150d006c.
Fix cleanup not deleting index entries
patch by jbellis; reviewed by slebresne for CASSANDRA-4379
Merge branch 'cassandra-1.1' into trunk
Remove ancient DD cruft
Remove matching ancient cruft in Config
Fix leveled promote integrity check
(cql3) allow updating column_alias types
patch by Pavel Yaskevich; reviewed by Sylvain Lebresne for CASSANDRA-4041
merge from 1.1
lookup hints by ID, not token

Patch by Sam Overton; reviewed by eevans for CASSANDRA-4389
Add Commitlog Versioning
patch by Vijay; reviewed by jbellis for CASSANDRA-4357
Fix License headers and add assert which was missed.
commitlog cleanup; fixes stderr for RecoveryManager2Test on Windows
all the sups
Add CI status to README.
factored out test-common.js. fix: was running test sequence twice in node.js
jslint settings and cleanup
moved error reporting into test-common.js
renamed test-data-graft.* to test-1.*
line para
Localisation updates from http://translatewiki.net.

Change-Id: I9e142a87b8fb729065d300e805325becdf21bc19
Bug 36328 - Collection: Call to a member function getDBkey() on a non-object

Change-Id: Id371c9f12bd381520003deaca85818d871c70cc5
Localisation updates from http://translatewiki.net.

Change-Id: I97bec863b85fa97080e5c7221e3e99fc9fd13dcd
Merge "Bug 36328 - Collection: Call to a member function getDBkey() on a non-object"
Localisation updates from http://translatewiki.net.

Change-Id: I822c062aa5c4a20d43d4da5843fc1cae7e75d461
Localisation updates from http://translatewiki.net.

Change-Id: I34a99fa2c8d9791df5497b0299a580556d050d38
Fixed bug with protein ids when using combined files in msgfdbReader. Also added the option for number of hits per spectrum to it.
Merged with Krzychu's changes (positioning).
Reimplemented arrows with "marker" element.
added suggestions, bug fixes
more coloredInput performance changes for IE8; improve pattern performance fix for Opera
fix pattern for IE10
added another control to demo, added some touch events, improved attachEvent component of addListener
setup some scaffolds
modify constants in index.php
[task/Pimple] Pass the Pimple object into the `stk_toolbox_category` object
Final removal of grab_globals script
Base project - sinatra, mongoid, cucumber, rspec, unicorn
Merge branch 'master' of github.com:phy5ics/ted-api-fifty
Dirty workaround
Added function and route for /beer/add, Adds a beer to the triple store
Some more indicator work
Updated indicator-session, added older version which is Gtk+ 3.4 compatible
Creating modules structure, rewriting the merge/setup script
University -> slider + index logo mezők

Signed-off-by: Balázs Antal <balazs.antal@pixelephant.hu>
add a dependency on catkin_pkg for Fuerte
0.4.12
- note about too new kdepimlibs (>= 4.9.2) incompatible with kdepim 4.4
Added wirble to irb for syntax highlighting
Adds link to Github pages
The default now in script* is that sigen is not avoiding lines
/ping hits riak w/ a ping
準備金補充に関するRole、Contextを追加した
Added 'next' and 'previous' buttons for pagination.
display "Add also reverse record" checkbox in "Add record to zone" view.
Merge branch 'release/0.0.1' into develop
Add a south dependency
Prep for release
Merge branch 'release/0.1'
added first bug
adding in a bunch of tests.  I don't know why Permutation#for_mapping
fails when given arrays of Fixnums.
fixed bootstrap
fixed name
Styled the flash messages.
Added custom routes for auth and fees.
added note and question to end of readme
Added test data for truncate_reverse_primer.py
Modified test data for truncate_reverse_primer.py, removed .DS_store files
Merge pull request #56 from walterst/truncate_reverse_primer

Added test data for truncate_reverse_primer.py
Patch to merged pull request afh:pull/template
Merge pull request #23 from thdox/afh-pull-template-patch-rc

Patch to merged pull request afh:pull/template
Hand it to Mridul
Revert "Updated README file"

This reverts commit c4636150f2659ff4ce0d1f65b2416ec38d907a84.
Revert "Updated readme file"

This reverts commit 451ce9858ccff69ad72bf67c47de39bd61541cdf.
Revert "Updated readme file"

This reverts commit 6b2b7fab5dd401b00f010041de25dc412191d3c0.
Revert "Updated readme file"

This reverts commit 7f3bccd59091f7062ef554ba025a5299e2873c3f.
[TASK] Integrate CreateJS
[TASK] Set toolbarState to halloToolbarContextual

Setting this setting after initialization of CreateJS
does not work as expected. The toolbar is split from
the annotate button but the toolbar is not floating
next to the content element but in the header bar.

Code used:

jQuery('body').midgardCreate('configureEditor', 'title', 'halloWidget', {
	plugins: {
		halloformat: {}
	},
	parentElement: 'body',
	toolbarState: 'halloToolbarContextual'
});
Manu recipe window: Added context menu with options to add additional row, clear selected row and sort by name.
Changed aesthetics

- Added kitchen background image.
- Implemented fading on options
Use seperate gemfiles for testing on travis
BUG 9855 REST services for ProcessMaker Solved
PROBLEM there were not any documentation of Rest using Curl, and using rest with Java.
SOLVED There were add classes to help to use Rest by Curl, and examples to use rest with Java were added.
Add spec_params.rb and loop on more environments
Updated composer.json file used for Travis test environment.
Merge branch 'master' of https://github.com/raykolbe/DOMPDFModule
implemented first gui, still ConcurrentMod-Exc.
add a bare nova-volume cookbook
Merge pull request #48 from rackerjoe/ubuntu-precise

bare nova-volumes support
Move CEDET configuration to its own file
Don't choke when ac-sources does not exist
Remove stale OpenIndiana comments
Comment out a couple el-get packages
Teach jka-compr about .txz files
Change the default font style and color

This switches to Onuava which may not look great at all resolutions
but works well and 9pt.  It also reduces the overall contrast between
foreground and background by switching to a slightly warm dark-gray
and off-white.
Merge branch 'master' of github.com:rdparker/emacs-config
point people to W. Trevor King's version
Automatic overlay update [Tue Apr 03 06:01:09 CEST 2012].
Automatic update [Wed Dec 26 06:11:13 CET 2012].
Tidy up of output rdf
updated chords
v0.7
disallow to overide the objects manager and if not setting it up with an instance and not class
fix for not keeping reference to old manager which are copied to inherited model
Merge pull request #12 from rach/master

I had to do a fix to not keeping reference to the old manager
Implemented a dynamic collapsible navigation tree and improved the styling.
Catch logic exceptions when it is about a missing parser
Add exception type symbols
Merge pull request #2 from vierbergenlars/master

Let FolderProvider ignore files without parser
PullToRefresh experiments
PORT: update debian files
Add expression:Get neighbor UID by UID and direction
cant find the correct way to pass these messages
Closes #651 - Sanitze CRLF for messages passed to the log file
Merge branch 'v2.5b' of github.com:ushahidi/Ushahidi_Web into v2.5b
Escape query params in installer. Closes #745

* Change the method for updating settings for map.. complicated query
  was wiping other settings. Simple update is easier.
Merge branch 'v2.5b' of git://github.com/ushahidi/Ushahidi_Web into v2.5b
Added drawArm
Merge branch 'master' of https://github.com/rlf6/computergraphics

Conflicts:
	kangaroo.cpp
Fixed Conflict
Basic canvas frame
implemented default image when no avatar present
update scelets
no more dependency on sensor and controller
[Serializer] Normalize exceptions
[Yaml] Normalize exceptions
Auth::check_password() has been moved to Auth_ORM::check_password()
Removing unnecessary debug statements
Updated Total Impact logo.
Updated roxygen documentation.
fixed documentation error (changed get_tiid to tiid)
Updated roxygen documentation.
Merge branch 'release/v1.0.9' into develop
fix stupid strpos bug
Merge branch 'develop'
convert TODO to README
gallery fixes 3
added wiki config
updated doc
pom updated
Merge pull request #11 from rstiller/develop

Develop
testing rm-fix typo
test for markdown syntax2
Notification new label style fix.
md5 summ checking added for each packaging process
Merge branch 'master' of github.com:rubybots/debian-rbenv
Added xml_status switch to sofia status command - makes it easier to work with response body
Adding chat functionality
Added some chat command test coverage.
Added test coverage to chat command
Merge pull request #4 from chris-teague/chat_command

Added support for FreeSwitch Chat command
gesture recognizer helpers should returns gesture recognizer instead of a block
Started porting over Franz's point target analysis tool. Currently it is determining the peak amplitude and the offsets in x and y.

Adapted an extended version of calc_stats that allows to change the reporting level (just calculate and keep quiet about it).
Started tests for Local_Extremum.
Started tests for Local_Extremum
Finished tests for Local Extrema.
Merge branch 'master' of https://github.com/run4flat/Regex-engine
Added location parsing for ZWA.
Merge branch 'master' of git://github.com/jgiegold/Regex-engine
Fixed a few typos/generalities for parse_location
Added new tests for Scrooge::ZWA::parse_location
Initial tests and modifications for parse_location
Added rounding handling to parse_location
Extracted grouping prep_all function

In order to create new grouping patterns such as re_named_seq, we
need to be able to modify how the prepping happens for grouping
patterns. This commit extracts that functionality into its own
function, which can be overridden by derived classes.
Turning on the zoom controls.
Revert converting to Backbone collection for mark register
Temp. remove touch events to figure out what is wrong.
Improve the output of builds that don't have all the related pull-request information. Also makes the script more generic.
Change all code.

Fix bug and Clean up code
added some fields on member
changed edit user to check for memberId, not edit parameter
removed console log
fix color
Merge remote-tracking branch 'origin/master'
new imdb
SAKIII-5866 fixed release build for windows
Merge remote-tracking branch 'jsloane/SAKIII-5866' into SAKIII-5866
SAKIII-5583 Setting sharing config so that private documents can't be shared out isn't applied when adding existing content to a group
SAKIII-5587 No user feedback given when trying to share multiple items via Add To and one of those items cannot be shared

Squashed commit of the following:

commit 066fac09b6aec2e726c443c7b8f516a439b73c27
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Wed May 9 12:23:21 2012 +0100

    SAKIII-5587 No user feedback given when trying to share multiple items via Add To and one of those items cannot be shared

commit 8bd3c3319ec8f2e4872b91bc295b0db2140a2d8a
Author: Christian Vuerings <vueringschristian@gmail.com>
Date:   Tue May 8 16:15:48 2012 -0700

    SAKIII-5587 - User feedback for can't share content - Add to
    https://jira.sakaiproject.org/browse/SAKIII-5587
Merge pull request #2101 from bp323/SAKIII-5587

SAKIII-5587 No user feedback given when trying to share multiple items via Add To and one of those items cannot be shared
Merge pull request #2102 from bp323/SAKIII-5583

SAKIII-5583 Setting sharing config so that private documents can't be shared out isn't applied when adding existing content to a group

* bp323/SAKIII-5583:
  SAKIII-5583 Setting sharing config so that private documents can't be shared out isn't applied when adding existing content to a group
PR follow-up for loading loaded widgets
Merge branch 'Hilary' of github.com:sakaiproject/3akai-ux into Hilary
Merge pull request #689 from zathomas/kern-2678
version1
version4
chart title can be optional
Correcao da composicao do titulo do site e alteracao no slider que desceu 20px.
removed fluid-container
Fixed semaphore memory leak
Add logging description in readme
DNA work
table of times by location
travel times from bing api
bing api key removed
added profile for building the release of the Scala IDE against both Scala 2.10 and Scala 2.11
fixes a bug were line number were lost
Merge branch 'resolveCatchType'
Changed to couchrest_model
Ajustes na estrutura de dados, a estrutura externa é uma lista
Fixed the glyph destruction when no kerning was added
Merge branch 'master' of github.com:scooterman/libgdx-cpp
term block styling
Updated README to remove version number.
[2517] Improve script for Arlokk

Note: triggered spell 24211 needs to be implemented in core, because it's missing from DBC
ToDo: Add reset code for the Gong when the core will support this properly
[2742] Implement script for escort quest 10406

Thanks grz3s for providing the data
how to install + npm support
entry point
now copies a prebuilt app instead of creating one and modifying it
repo_0 20120509
- 1.9: fixed bang method name.
pushed tests up to SP
[git-p4: depot-paths = "//src/ruby_parser/dev/": change = 7624]
Issue 1103: isolate polling of nodes into its own class
Merge pull request #895 from jclouds/isolate-polling

Issue 1103: isolate polling of nodes into its own class
Prefer immutable over empty collections

The former does not create an object when calling iterator(), as
discussed here:

https://groups.google.com/d/msg/jclouds-dev/l7BviKDXreA/mP6Ow_RYxIgJ
Merge pull request #905 from andrewgaul/immutable-of

Prefer immutable over empty collections
Merge branch 'master' of git://github.com/jclouds/jclouds
I improved the tool to compare tools.

Signed-off-by: Sébastien Boisvert <sebastien.boisvert.3@ulaval.ca>
I Removed useless parameters from the script that computes components.
sponsor positioned
Added possibility to load appropriate Windows SDK environment.
Merged Leander and Bram's code more.
libpropeller updates
Added sizeThatFits to UISwitch
 Added UITableViewCellStyleValue1 support
presentModalViewController now presents popovers like on the iPad. i.e - does not only show fullscreen!
social-popup-redirect
Fixed manifest to lowercase spotidora
use strict
Merge branch 'master' of github.com:shannonmoeller/workit
set default config "use_asi_encryptor: true"
Merge branch 'release/v2.4.4' into develop
Fix RSS title in Finnish
Fixing the community_updates email closer to sendable state
Re-enable the old style tribe updates, as the new one requires more time
Merge the changes that bring back the old style community updates email
Merge commit 'c97839607fdf9ee4fa8bd1397f84311ae34eb2f6' into develop
fix the test to pass
Version 2.4.5
Merge branch 'release/v2.4.5'
force + easing
Merge branch 'master' of github.com:sharismlab/seuron_viz
add pictures to user and sponsor
Merge branch 'master' of github.com:sharocko/helping_hand
add new filter option and delete view patch

Global changes for issue range plugin.  Delete view patch for
compatibility with new redmine versions.
update readme file for version 0.0.2
add .gitignore in app folder
newest incarnations of conway game of life
* 增加gevent模式
cmd-exit-notify
Fixed sparse matrix handling in static
inplace arithmetic operators for dense features
Merge pull request #650 from gsomix/buffer_protocol

Inplace arithmetic operators for DenseFeatures
*  documentation JLCoverTree warnings fix
Merge branch 'ct-warningfix' of git://github.com/iglesias/shogun
Extended CV MC storage more
Update .emacs

all mode automatically add auto-complete-mode
Refactored upload routes and contact_info_fields a little. Hopefully nothing broke
Tiny refactoring
Merge branch 'tom' of github.com:sicophrenic/CS169-ICA into tom
renal sort, pvera update
Mise a jour de gunicorn
BUGFIX Revert remove of function_exists() check for mcrypt in
7d84aff01e, as we don't expect mcrypt to actually be available,
since fallbacks in RandomGenerator are available.
Removed SiteTree.MetaTitle and MetaKeywords usage
Merge pull request #812 from chillu/pull/sitetree-meta-removal

Removed SiteTree.MetaTitle and MetaKeywords usage
Sort IOServices and IOStrands so they don't change order when servers restart.
Sort prox tree nodes by ID so layout is consistent between replicated trees.
Shorten transition time for prox visualization hover info.
Commit three patches for the Magento Solr integration

config.xml.patch
perform complete index with cli
Abstract.php.patch
stop noticed being raised on attributes
Service.php.patch
fix issue with ping not returning
Add "Securing services" french translation part for the security cookbook chapter
Add "Target Path" french translation part for the security cookbook chapter
Add "Slash in parameter" french translation part for the routing cookbook chapter
Updated minor missing styles, updated text domain and credits, and added new slideshow post type
Remove breadcrumb on Licenses page
forgot this

Change-Id: I88394674eeece31db9c50ea54a9a01c128a65212
удалена пагинация

Signed-off-by: Deyarov Ruslan <sm00th1980@mail.ru>
MOSYNC updated textscreen handling
adding source_smarttypes_exec_script.sh
去掉design页面中的预加载
use correct rule name.
Add Markdown documentation link
Merge pull request #2 from atomic-penguin/master

Add markdown documentation
imp BornEditor
fix ajuste versiones android sdk

Daba problemas de compilacion bajo ciertas circustancias en eclipse. Se
ha unificado a target API 15 Ice Cream Sandwich en project.properties,
pom.xml y AndroidManifest.xml.
removing ActionBarSherlock and ViewPagerIndicator will replace with a cloned version
Default clone of ActionBarSherlock 4.0.2 and ViewPagerIndicator 2.2,3
added .gitignore for .checkstyle
Had to use a different regex replacer for Ant 1.7.0 support
Fixed recirsive loop - still does not run correctly
WebDAV Support. Fixed #6.
README. Refs #6.
Added structure to products page, more styling, removed comments from single page
additional styling, functions, and pages for theme
removed temp images, added jquery loading to product pages
Gem updates
Add newrelic
move newrelic to production only
comment out ssl
Smooth shading guaranteed now.
after-content call added to page.php
[#7517] Add ability to duplicate Articles Container
migrate image/gpx-urls
Bumped Version and Change History for E.Z. Hart changes

Bumped version to reflect the merged pull request from E.Z. Hart
Use fewer temporaries mangling APSInt objects. The performance difference
is negligible, but it makes the code clearer. Based on a suggestion by
Jordy Rose.


git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@157601 91177308-0d34-0410-b5e6-96231b3b80d8
Use the standard values for the __cplusplus macro, even when in GNU mode. GCC
dropped its prior behavior of always defining __cplusplus to 1 in GNU mode in
version 4.7.


git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@156113 91177308-0d34-0410-b5e6-96231b3b80d8
[driver - crash diagnostics] Convert the flags back to an array of strings and use
array_lengthof.  Also, append the new filename with correct preprocessed suffix.
Last part of rdar://11285725


git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@156117 91177308-0d34-0410-b5e6-96231b3b80d8
Add support for full-width 128-bit integer literals.

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@156123 91177308-0d34-0410-b5e6-96231b3b80d8
modern objc translator: support for default property
synthesis translation. // rdar://11374235 - wip.


git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@156125 91177308-0d34-0410-b5e6-96231b3b80d8
Don't require a space between the two ">" in "vector<id<protocol>>" in objc++11.

C++11 allowed writing "vector<vector<int>>" without a space between the two ">".
This change allows this for protocols in template lists too in -std=c++11 mode,
and improves the diagnostic in c++98 mode.



git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@170223 91177308-0d34-0410-b5e6-96231b3b80d8
[CMake] Move libxml2 stuff from clang to llvm/cmake.

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@170225 91177308-0d34-0410-b5e6-96231b3b80d8
[preprocessor] For errors at a function macro invocation, also include
a note about where the macro is defined.

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@170228 91177308-0d34-0410-b5e6-96231b3b80d8
Style and Doc fix for CommonOptionsParser
    
- Renaming GetCompilations() and GetSourcePathList() to follow LLVM
  style.
- Updating docs to reflect name change.
- Also updating help text to not mention clang-check since this class
  can be used by any tool.

Reviewed By: Alexander Kornienko


git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@170229 91177308-0d34-0410-b5e6-96231b3b80d8
[ms-inline asm] Update for the MatchInstruction API change in r163101.

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@163102 91177308-0d34-0410-b5e6-96231b3b80d8
Factor out computation of whether a typeid's expression is potentially
evaluated into a CXXTypeid member function. No functionality change.


git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@161779 91177308-0d34-0410-b5e6-96231b3b80d8
[ms-inline asm] Have patchMSAsmStrings() return a vector or AsmStrings.

The AsmParser expects a single asm instruction, but valid ms-style inline asm
statements may contain  multiple instructions.

This happens with asm blocks

__asm {
  mov ebx, eax
  mov ecx, ebx
}

or when multiple asm statements are adjacent to one another

__asm mov ebx, eax
__asm mov ecx, ebx

and

__asm mov ebx, eax __asm mov ecx, ebx

Currently, asm blocks are not properly handled.


git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@161780 91177308-0d34-0410-b5e6-96231b3b80d8
Convert comments to proper Doxygen comments.



git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@158241 91177308-0d34-0410-b5e6-96231b3b80d8
Correct method name in comment: from LexRawToken to LexFromRawLexer, according
to a change done long ago in r57393.



git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@158243 91177308-0d34-0410-b5e6-96231b3b80d8
[C++11 Compat] Fix breaking change in C++11 pair copyctor.

While this code is valid C++98, it is not valid C++11. The problem can be
reduced to:

class MDNode;

class DIType {
  operator MDNode*() const {return 0;}
};

class WeakVH {
  WeakVH(MDNode*) {}
};

int main() {
  DIType di;
  std::pair<void*, WeakVH> p(std::make_pair((void*)0, di)));
}

This was not detected by any of the bots we have because they either compile
C++98 with libstdc++ (which allows it), or C++11 with libc++ (which incorrectly
allows it). I ran into the problem when compiling with VS 2012 RC.

Thanks to Richard for explaining the issue.

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@158245 91177308-0d34-0410-b5e6-96231b3b80d8