Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Changed scheduler.json interval field from int to duration #36

Merged
merged 2 commits into from
Oct 26, 2015
Merged

Changed scheduler.json interval field from int to duration #36

merged 2 commits into from
Oct 26, 2015

Conversation

stankovski
Copy link
Member

No description provided.

@azurecla
Copy link

Hi @stankovski, I'm your friendly neighborhood Azure Pull Request Bot (You can call me AZPRBOT). Thanks for your contribution!


It looks like you're working at Microsoft (destanko). If you're full-time, we DON'T require a contribution license agreement.



If you are a vendor, or work for Microsoft Open Technologies, DO please sign the electronic contribution license agreement. It will take 2 minutes and there's no faxing! https://cla.azure.com.

TTYL, AZPRBOT;

stankovski added a commit that referenced this pull request Oct 26, 2015
@stankovski
Merge pull request #36 from stankovski/master
28ea011 
Changed scheduler.json interval field from int to duration
@stankovski stankovski merged commit 28ea011 into Azure:master Oct 26, 2015
matthchr pushed a commit to matthchr/azure-rest-api-specs that referenced this pull request May 9, 2017
@hyonholee @yugangw-msft
Add singlePlacementGroup to VMSS property (Azure#36)
02b50f9 
* Add singlePlacementGroup to VMSS property

* Update description
erjms pushed a commit to erjms/azure-rest-api-specs that referenced this pull request Apr 19, 2022
@ZhidaLiu
Merge pull request Azure#36 from ZhidaLiu/user/zhili/FolderMove1001
de4209f 
Move 1001 folder to machinelearning
mengaims added a commit that referenced this pull request Jan 11, 2024
@mengaims @suxi-ms
@liulixiang1988 @zhaiyutong @JieZhou000 @Sayaka-4987
Add private preview versions to feature branch (#43) (#27352)
87e46c2 
* Add ga contract for Content Safety

* Update examples for 2023-10-01

* Resolve ModelValidation SpellCheck and Avocado

* Fix typo

* Fix minor errors in example and readme

* Fix example

* remove the 0430 content

* update readme

* re-format markdowm

* Fix example

* init content safety 2023-10-15-preview

* init content safety 2023-10-15-previwe

* update

* format example

* update read me file

* update

* update

* update contract

* update

* update

* update threshold

* update new contract by add judgement kind enum

* update description

* u

* update

* updat length

* update

* update

* update description for accept severity threshodl

* update

* merge with acs-ga

* Add snippy contract

* remove 8 sev levels for image

* update contentsafety.json

* Update snippy path

* add type spec for jailbreak

* Add incident response API in 2023-10-30-preview

* compiled

* Adaptive annotation service contract

* Remove operations

* update

* update

* refine

* update

* make 0,1,2,3,4,5,6,7 to 0, 1, 2, 3, ... and add comman in last enum value

* update path

* Update NL Snippy path

* Resolve conflict

* add

* add

* remove labelName

* Fix route and minor errors

* Change typo

* update

* Update protected material API

* update project sample

* Change path name

* Update protect material contract

* update jailbreak

* Update incident contract

* Update contract

* Update

* scenarios to enumerations (#19)

* Remove project related contract (#20)

* Remove project related things

* Remove accepted

* Remove examples

* Merge 1015 (#22)

* Add ga contract for Content Safety

* Update examples for 2023-10-01

* Resolve ModelValidation SpellCheck and Avocado

* Fix typo

* Fix minor errors in example and readme

* Fix example

* remove the 0430 content

* update readme

* re-format markdowm

* Fix example

* init content safety 2023-10-15-preview

* init content safety 2023-10-15-previwe

* update

* format example

* update read me file

* update

* update

* update contract

* update

* update

* update threshold

* update new contract by add judgement kind enum

* update description

* u

* update

* updat length

* update

* update

* update description for accept severity threshodl

* update

* merge with acs-ga

* Add snippy contract

* remove 8 sev levels for image

* update contentsafety.json

* Update snippy path

* add type spec for jailbreak

* compiled

* update

* update

* refine

* update

* make 0,1,2,3,4,5,6,7 to 0, 1, 2, 3, ... and add comman in last enum value

* update path

* Update NL Snippy path

* Resolve conflict

* Update protected material API

* update project sample

* Change path name

* Update protect material contract

* update jailbreak

* Remove project related contract (#20)

* Remove project related things

* Remove accepted

* Remove examples

---------






* Add list API for Annotation Service (#23)

* Add ga contract for Content Safety

* Update examples for 2023-10-01

* Resolve ModelValidation SpellCheck and Avocado

* Fix typo

* Fix minor errors in example and readme

* Fix example

* remove the 0430 content

* update readme

* re-format markdowm

* Fix example

* init content safety 2023-10-15-preview

* init content safety 2023-10-15-previwe

* update

* format example

* update read me file

* update

* update

* update contract

* update

* update

* update threshold

* update new contract by add judgement kind enum

* update description

* u

* update

* updat length

* update

* update

* update description for accept severity threshodl

* update

* merge with acs-ga

* Add snippy contract

* remove 8 sev levels for image

* update contentsafety.json

* Update snippy path

* add type spec for jailbreak

* compiled

* update

* update

* refine

* update

* make 0,1,2,3,4,5,6,7 to 0, 1, 2, 3, ... and add comman in last enum value

* update path

* Update NL Snippy path

* Resolve conflict

* Update protected material API

* update project sample

* Change path name

* Update protect material contract

* update jailbreak

* Remove project related contract (#20)

* Remove project related things

* Remove accepted

* Remove examples

* Add list category APIs

---------






* Update contract for incident response (#24)



* scenarios to enumerations (#25)

* [Cognitive Services - Azure AI Content Safety] - 2023-11-30-preview Private Preview

* update doc

* resolve comments.

* Merge main and recompile swagger

* add explanation for 2023-11-30-preview

* format

* generate swagger

* Optimize contract (#36)

* add 12-30-preview, add explanation spec

* update

* renamed reason -> harmful chunks

* update.

* remove new version enum from GA version

* Remove examples from 1015

* restore examples

* Add examples for jailbreak and protected material

* run prettier for example

* commit add enum to stable

* Add omit-unreachable-types: true to typespec

* compile preview

* Fix readme

* renamed to citation

* UPDATE: add reasoning column and update some docs.

* update doc.

* update api version.

* Fix some typo issues. (#40)

* Update data plane.

* Remove unused versions

---------

Co-authored-by: FAREAST\suxi <suxi@microsoft.com>
Co-authored-by: Lixiang Liu <lixiangliu@microsoft.com>
Co-authored-by: Lixiang Liu <liulixiang1988@gmail.com>
Co-authored-by: zhaiyutong <mo.huainian@163.com>
Co-authored-by: YUTONG_ZHAI <32332316+zhaiyutong@users.noreply.github.com>
Co-authored-by: Jie Zhou <zhojie@microsoft.com>
Co-authored-by: Yuxiao Wang <yuxiaowang@microsoft.com>
Co-authored-by: Yuxiao Wang <58904990+Sayaka-4987@users.noreply.github.com>
Co-authored-by: jiezhou_microsoft <94604058+JieZhou000@users.noreply.github.com>
mengaims added a commit that referenced this pull request Feb 12, 2024
@mengaims @suxi-ms
@liulixiang1988 @zhaiyutong @JieZhou000 @Sayaka-4987 @DavidZeLiang @lemonicetea
[Cognitive Services - Azure AI Content Safety] - [Private Preview] - …
0a5e52c 
…Add Image Batch Detection (#27353)

* Add private preview versions to feature branch (#43)

* Add ga contract for Content Safety

* Update examples for 2023-10-01

* Resolve ModelValidation SpellCheck and Avocado

* Fix typo

* Fix minor errors in example and readme

* Fix example

* remove the 0430 content

* update readme

* re-format markdowm

* Fix example

* init content safety 2023-10-15-preview

* init content safety 2023-10-15-previwe

* update

* format example

* update read me file

* update

* update

* update contract

* update

* update

* update threshold

* update new contract by add judgement kind enum

* update description

* u

* update

* updat length

* update

* update

* update description for accept severity threshodl

* update

* merge with acs-ga

* Add snippy contract

* remove 8 sev levels for image

* update contentsafety.json

* Update snippy path

* add type spec for jailbreak

* Add incident response API in 2023-10-30-preview

* compiled

* Adaptive annotation service contract

* Remove operations

* update

* update

* refine

* update

* make 0,1,2,3,4,5,6,7 to 0, 1, 2, 3, ... and add comman in last enum value

* update path

* Update NL Snippy path

* Resolve conflict

* add

* add

* remove labelName

* Fix route and minor errors

* Change typo

* update

* Update protected material API

* update project sample

* Change path name

* Update protect material contract

* update jailbreak

* Update incident contract

* Update contract

* Update

* scenarios to enumerations (#19)

* Remove project related contract (#20)

* Remove project related things

* Remove accepted

* Remove examples

* Merge 1015 (#22)

* Add ga contract for Content Safety

* Update examples for 2023-10-01

* Resolve ModelValidation SpellCheck and Avocado

* Fix typo

* Fix minor errors in example and readme

* Fix example

* remove the 0430 content

* update readme

* re-format markdowm

* Fix example

* init content safety 2023-10-15-preview

* init content safety 2023-10-15-previwe

* update

* format example

* update read me file

* update

* update

* update contract

* update

* update

* update threshold

* update new contract by add judgement kind enum

* update description

* u

* update

* updat length

* update

* update

* update description for accept severity threshodl

* update

* merge with acs-ga

* Add snippy contract

* remove 8 sev levels for image

* update contentsafety.json

* Update snippy path

* add type spec for jailbreak

* compiled

* update

* update

* refine

* update

* make 0,1,2,3,4,5,6,7 to 0, 1, 2, 3, ... and add comman in last enum value

* update path

* Update NL Snippy path

* Resolve conflict

* Update protected material API

* update project sample

* Change path name

* Update protect material contract

* update jailbreak

* Remove project related contract (#20)

* Remove project related things

* Remove accepted

* Remove examples

---------

Co-authored-by: FAREAST\suxi <suxi@microsoft.com>
Co-authored-by: Lixiang Liu <lixiangliu@microsoft.com>
Co-authored-by: Lixiang Liu <liulixiang1988@gmail.com>
Co-authored-by: zhaiyutong <mo.huainian@163.com>

* Add list API for Annotation Service (#23)

* Add ga contract for Content Safety

* Update examples for 2023-10-01

* Resolve ModelValidation SpellCheck and Avocado

* Fix typo

* Fix minor errors in example and readme

* Fix example

* remove the 0430 content

* update readme

* re-format markdowm

* Fix example

* init content safety 2023-10-15-preview

* init content safety 2023-10-15-previwe

* update

* format example

* update read me file

* update

* update

* update contract

* update

* update

* update threshold

* update new contract by add judgement kind enum

* update description

* u

* update

* updat length

* update

* update

* update description for accept severity threshodl

* update

* merge with acs-ga

* Add snippy contract

* remove 8 sev levels for image

* update contentsafety.json

* Update snippy path

* add type spec for jailbreak

* compiled

* update

* update

* refine

* update

* make 0,1,2,3,4,5,6,7 to 0, 1, 2, 3, ... and add comman in last enum value

* update path

* Update NL Snippy path

* Resolve conflict

* Update protected material API

* update project sample

* Change path name

* Update protect material contract

* update jailbreak

* Remove project related contract (#20)

* Remove project related things

* Remove accepted

* Remove examples

* Add list category APIs

---------

Co-authored-by: FAREAST\suxi <suxi@microsoft.com>
Co-authored-by: Lixiang Liu <lixiangliu@microsoft.com>
Co-authored-by: Lixiang Liu <liulixiang1988@gmail.com>
Co-authored-by: zhaiyutong <mo.huainian@163.com>

* Update contract for incident response (#24)

Co-authored-by: Lixiang Liu <lixiangliu@microsoft.com>

* scenarios to enumerations (#25)

* [Cognitive Services - Azure AI Content Safety] - 2023-11-30-preview Private Preview

* update doc

* resolve comments.

* Merge main and recompile swagger

* add explanation for 2023-11-30-preview

* format

* generate swagger

* Optimize contract (#36)

* add 12-30-preview, add explanation spec

* update

* renamed reason -> harmful chunks

* update.

* remove new version enum from GA version

* Remove examples from 1015

* restore examples

* Add examples for jailbreak and protected material

* run prettier for example

* commit add enum to stable

* Add omit-unreachable-types: true to typespec

* compile preview

* Fix readme

* renamed to citation

* UPDATE: add reasoning column and update some docs.

* update doc.

* update api version.

* Fix some typo issues. (#40)

* Update data plane.

* Remove unused versions

---------

Co-authored-by: FAREAST\suxi <suxi@microsoft.com>
Co-authored-by: Lixiang Liu <lixiangliu@microsoft.com>
Co-authored-by: Lixiang Liu <liulixiang1988@gmail.com>
Co-authored-by: zhaiyutong <mo.huainian@163.com>
Co-authored-by: YUTONG_ZHAI <32332316+zhaiyutong@users.noreply.github.com>
Co-authored-by: Jie Zhou <zhojie@microsoft.com>
Co-authored-by: Yuxiao Wang <yuxiaowang@microsoft.com>
Co-authored-by: Yuxiao Wang <58904990+Sayaka-4987@users.noreply.github.com>
Co-authored-by: jiezhou_microsoft <94604058+JieZhou000@users.noreply.github.com>

* Customized category / customized model related spec changes (#45)

* Add ga contract for Content Safety

* Update examples for 2023-10-01

* Resolve ModelValidation SpellCheck and Avocado

* Fix typo

* Fix minor errors in example and readme

* Fix example

* remove the 0430 content

* update readme

* re-format markdowm

* Fix example

* init content safety 2023-10-15-preview

* init content safety 2023-10-15-previwe

* update

* format example

* update read me file

* update

* update

* update contract

* update

* update

* update threshold

* update new contract by add judgement kind enum

* update description

* u

* update

* updat length

* update

* update

* update description for accept severity threshodl

* update

* merge with acs-ga

* Add snippy contract

* remove 8 sev levels for image

* update contentsafety.json

* Update snippy path

* add type spec for jailbreak

* Add incident response API in 2023-10-30-preview

* compiled

* Adaptive annotation service contract

* Remove operations

* update

* update

* refine

* update

* make 0,1,2,3,4,5,6,7 to 0, 1, 2, 3, ... and add comman in last enum value

* update path

* Update NL Snippy path

* Resolve conflict

* add

* add

* remove labelName

* Fix route and minor errors

* Change typo

* update

* Update protected material API

* update project sample

* Change path name

* Update protect material contract

* update jailbreak

* Update incident contract

* Update contract

* Update

* scenarios to enumerations (#19)

* Remove project related contract (#20)

* Remove project related things

* Remove accepted

* Remove examples

* Merge 1015 (#22)

* Add ga contract for Content Safety

* Update examples for 2023-10-01

* Resolve ModelValidation SpellCheck and Avocado

* Fix typo

* Fix minor errors in example and readme

* Fix example

* remove the 0430 content

* update readme

* re-format markdowm

* Fix example

* init content safety 2023-10-15-preview

* init content safety 2023-10-15-previwe

* update

* format example

* update read me file

* update

* update

* update contract

* update

* update

* update threshold

* update new contract by add judgement kind enum

* update description

* u

* update

* updat length

* update

* update

* update description for accept severity threshodl

* update

* merge with acs-ga

* Add snippy contract

* remove 8 sev levels for image

* update contentsafety.json

* Update snippy path

* add type spec for jailbreak

* compiled

* update

* update

* refine

* update

* make 0,1,2,3,4,5,6,7 to 0, 1, 2, 3, ... and add comman in last enum value

* update path

* Update NL Snippy path

* Resolve conflict

* Update protected material API

* update project sample

* Change path name

* Update protect material contract

* update jailbreak

* Remove project related contract (#20)

* Remove project related things

* Remove accepted

* Remove examples

---------

Co-authored-by: FAREAST\suxi <suxi@microsoft.com>
Co-authored-by: Lixiang Liu <lixiangliu@microsoft.com>
Co-authored-by: Lixiang Liu <liulixiang1988@gmail.com>
Co-authored-by: zhaiyutong <mo.huainian@163.com>

* Add list API for Annotation Service (#23)

* Add ga contract for Content Safety

* Update examples for 2023-10-01

* Resolve ModelValidation SpellCheck and Avocado

* Fix typo

* Fix minor errors in example and readme

* Fix example

* remove the 0430 content

* update readme

* re-format markdowm

* Fix example

* init content safety 2023-10-15-preview

* init content safety 2023-10-15-previwe

* update

* format example

* update read me file

* update

* update

* update contract

* update

* update

* update threshold

* update new contract by add judgement kind enum

* update description

* u

* update

* updat length

* update

* update

* update description for accept severity threshodl

* update

* merge with acs-ga

* Add snippy contract

* remove 8 sev levels for image

* update contentsafety.json

* Update snippy path

* add type spec for jailbreak

* compiled

* update

* update

* refine

* update

* make 0,1,2,3,4,5,6,7 to 0, 1, 2, 3, ... and add comman in last enum value

* update path

* Update NL Snippy path

* Resolve conflict

* Update protected material API

* update project sample

* Change path name

* Update protect material contract

* update jailbreak

* Remove project related contract (#20)

* Remove project related things

* Remove accepted

* Remove examples

* Add list category APIs

---------

Co-authored-by: FAREAST\suxi <suxi@microsoft.com>
Co-authored-by: Lixiang Liu <lixiangliu@microsoft.com>
Co-authored-by: Lixiang Liu <liulixiang1988@gmail.com>
Co-authored-by: zhaiyutong <mo.huainian@163.com>

* Update contract for incident response (#24)

Co-authored-by: Lixiang Liu <lixiangliu@microsoft.com>

* scenarios to enumerations (#25)

* [Cognitive Services - Azure AI Content Safety] - 2023-11-30-preview Private Preview

* update doc

* resolve comments.

* Merge main and recompile swagger

* add explanation for 2023-11-30-preview

* format

* generate swagger

* Optimize contract (#36)

* add 12-30-preview, add explanation spec

* update

* renamed reason -> harmful chunks

* update.

* remove new version enum from GA version

* Remove examples from 1015

* restore examples

* Add examples for jailbreak and protected material

* run prettier for example

* commit add enum to stable

* Add omit-unreachable-types: true to typespec

* compile preview

* Fix readme

* renamed to citation

* UPDATE: add reasoning column and update some docs.

* update doc.

* update api version.

* Fix some typo issues. (#40)

* Update data plane.

* draft

* draft

* draft

* draft

* draft

* draft

* draft

* draft

* draft

* draft

* draft

* update bd draft

* update spec draft

* update spec draft

* update spec draft

---------

Co-authored-by: mengaims <mengai@microsoft.com>
Co-authored-by: FAREAST\suxi <suxi@microsoft.com>
Co-authored-by: Lixiang Liu <lixiangliu@microsoft.com>
Co-authored-by: Lixiang Liu <liulixiang1988@gmail.com>
Co-authored-by: zhaiyutong <mo.huainian@163.com>
Co-authored-by: mengaims <50131889+mengaims@users.noreply.github.com>
Co-authored-by: YUTONG_ZHAI <32332316+zhaiyutong@users.noreply.github.com>
Co-authored-by: Jie Zhou <zhojie@microsoft.com>
Co-authored-by: Yuxiao Wang <yuxiaowang@microsoft.com>
Co-authored-by: Yuxiao Wang <58904990+Sayaka-4987@users.noreply.github.com>
Co-authored-by: jiezhou_microsoft <94604058+JieZhou000@users.noreply.github.com>
Co-authored-by: David Liang <liangze@microsoft.com>

* Add async batch image APIs in 2024-01-30-preview (#44)

* Add async batch image APIs in 2024-01-30-preview

* Update

* Update

* Add error message in GET resonse

* Mengai/acs customization (#47)

* Change annotation API

* Add prompt generation APIs

* fix explanation version (#52)

* fix explanation version

* delete 0130 version

* Update async batch image APIs in 2023-10-30-preview (#54)

* Add async batch image APIs in 2024-01-30-preview

* Update

* Update

* Add error message in GET resonse

* Update async batch image APIs in 2023-10-30-preview

* remove customized category (#59)

* Update batch image API contract (#60)

* Mengai/0130 private fix (#61)

* remove customized category

* remove useless definition

* Mengai/0130 private fix (#62)

* remove customized category

* remove useless definition

* change progressPercentage to int32

* Resolve warnings

* Suppress spell check

* Renaming

---------

Co-authored-by: FAREAST\suxi <suxi@microsoft.com>
Co-authored-by: Lixiang Liu <lixiangliu@microsoft.com>
Co-authored-by: Lixiang Liu <liulixiang1988@gmail.com>
Co-authored-by: zhaiyutong <mo.huainian@163.com>
Co-authored-by: YUTONG_ZHAI <32332316+zhaiyutong@users.noreply.github.com>
Co-authored-by: Jie Zhou <zhojie@microsoft.com>
Co-authored-by: Yuxiao Wang <yuxiaowang@microsoft.com>
Co-authored-by: Yuxiao Wang <58904990+Sayaka-4987@users.noreply.github.com>
Co-authored-by: jiezhou_microsoft <94604058+JieZhou000@users.noreply.github.com>
Co-authored-by: David Liang <davidliangze@foxmail.com>
Co-authored-by: David Liang <liangze@microsoft.com>
Co-authored-by: MinjueWu <597922968@qq.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@stankovski @azurecla